Merge branch 'zigonggao_dev' into huacheng_test

fengjin

2022-10-17 b69d2017fecdad6a1c9a09c0006e70ecea9efed0

 flower_city/src/main/java/com/dg/core/db/gen/mapper/ClassifyAdministrationMapper.java

@@ -69,6 +69,16 @@
    List<ClassifyAdministration>  selectRootList (@Param("parentId")String parentId,@Param("departmentId")Integer departmentId);


    /**
     * 根据上级id查询子分类
     * @param parentId
     * @return
     */
    List<String>  selectParent(String parentId);


    List<ClassifyAdministration>  selectParentData(String parentId);