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

Helius

2022-08-09 b74faa19bd619213d4de8772b1816c2f87c29449

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

@@ -17,6 +17,7 @@
    List<AdminColumnVo> selectColumnInListByParentId(@Param("parentId") Long parentidDefault, @Param("companyId") Long companyId);

    ColumnEntity selectByCodeAndCompanyId(@Param("code") String code, @Param("companyId") Long companyId);
    ColumnEntity selectParentColumnByCodeAndCompanyId(@Param("code") String code, @Param("companyId") Long companyId);

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