Merge branch 'zigonggao_dev' into huacheng_test

fengjin

2022-11-16 5ca8ff0110846078c80ac7e89b5e38bb8046c2a3

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

@@ -30,7 +30,7 @@
                                          @Param("userType") String userType,
                                          @Param("userName") String userName,
                                          @Param("ids") List<String> ids,
                                          @Param("String") String  isDivisionHead);
                                          @Param("isDivisionHead") String  isDivisionHead);