Merge branch 'zigonggao_dev' into huacheng_test

fengjin

2022-12-07 160ff613f71deed445f06abab3d0b3e77367f00b

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

@@ -64,7 +64,7 @@
    /**
     * 根据所属地区查找部门
     */
    List<OrganizationChartEntity> selectByCode(@Param("id")String id, @Param("areaCode") String areaCode);
    List<OrganizationChartEntity> selectByCode(@Param("id")String id, @Param("areaCode") String areaCode,@Param("grade")  Integer grade);