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

xiaoyong931011

2022-07-07 9b02eab3cb3fc2b487e6a3de3992aa3b7d284d40

 src/main/java/com/xcong/farmer/cms/modules/system/mapper/ColumnMapper.java

@@ -18,4 +18,6 @@
    ColumnEntity selectByCodeAndCompanyId(@Param("code") String code, @Param("companyId") Long companyId);

    List<ColumnEntity> selectColumnByParentId(@Param("parentId") Long parentId, @Param("companyId") Long companyId);

    IPage<ColumnEntity> selectColumnInPage(Page<ColumnEntity> page, @Param("record") ColumnEntity column);
}