Merge branch 'zigonggao_dev' into huacheng_test

fengjin

2022-10-14 d9f7787e24dd9ee4136298bcfd141aed1bb3ed7c

 flower_city/src/main/java/com/dg/core/service/IOrganizationChartService.java

@@ -62,5 +62,12 @@
    List<String> getIds(String id);


    /**
     * 根据id  查询是否有子部门
     * @param parentId
     * @param grade
     * @return
     */
    public List<OrganizationChartEntity> selectParentList(String parentId,String grade);

}