Merge branch 'zigonggao_dev' into huacheng_test

fengjin

2022-10-21 aa343eafae29f8171d22496ce876ead1d0f07bd0

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

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