Merge branch 'zigonggao_dev' into huacheng_test

fengjin

2022-09-29 7c52db14463d35f92e9339735feaf872ca00c48d

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

@@ -65,5 +65,5 @@
     *
     * @return 结果
     */
    List<SysUser> selectListByDepartmentId(@Param("departmentId") String departmentId,@Param("classifyId") String classifyId);
    List<SysUser> selectListByDepartmentId(@Param("list") List<String> list,@Param("classifyIdFront") String classifyIdFront,@Param("classifyIdAfter") String classifyIdAfter);
}