fix conflect

Helius

2022-07-05 b95699652357c6218b45eceb81170ddfebb30e1d

 src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/ReleaseServiceImpl.java

@@ -44,6 +44,12 @@
        Map<String, Object> map = new HashMap<>();
        map.put("id", columnEntity.getId());
        map.put("code", columnEntity.getColumnCode());
        if (columnEntity.getParentId() == 0L) {
            map.put("parentCode", columnEntity.getColumnCode());
        } else {
            ColumnEntity parent = columnMapper.selectById(columnEntity.getParentId());
            map.put("parentCode", parent.getColumnCode());
        }

        cmsCoreService.columnProcess(map, columnEntity.getListTemplate(), article);
    }