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

xiaoyong931011

2022-07-05 e703d415ff36584518a76d4d26363bfd1556b43b

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

@@ -245,6 +245,7 @@
                        child.setRemark(columnEntityChild.getRemark());
                        child.setPic(columnEntityChild.getPic());
                        child.setOrderNum(columnEntityChild.getOrderNum());
                        child.setContentType(columnEntityChild.getContentType());
                        adminColumnVoChilds.add(child);
                    }
                }