Merge branch 'master' of http://120.27.238.55:7000/r/farmer-cms

xiaoyong931011

2022-07-07 795084c308a27601e3a50280f9c0919adf87e32a

 src/main/java/com/xcong/farmer/cms/core/handler/ColumnDataParserHandler.java

@@ -37,6 +37,9 @@

        ColumnEntity columnEntity = columnMapper.selectByCodeAndCompanyId(param.getCode(), companyId);

        if (columnEntity == null) {
            return;
        }
        ColumnData columnData = columnToData(columnEntity);
        if (columnEntity.getParentId() == 0L) {
            List<ColumnEntity> child = columnMapper.selectColumnByParentId(columnEntity.getId(), companyId);