Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test

yanghui

2022-10-21 ef676e6bff9e9fa9d95a8f621e9dbbbdf690e718

 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);