Merge branch 'zigonggao_dev' into huacheng_test

fengjin

2022-12-07 160ff613f71deed445f06abab3d0b3e77367f00b

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

@@ -71,7 +71,8 @@
     */
    public int selectNum(@Param("userType") String userType,
                         @Param("userName") String userName,
                         @Param("ids") List<String> ids);
                         @Param("ids") List<String> ids,
                         @Param("isDivisionHead") String  isDivisionHead);

    /**
     * 根据部门id及分类id获取导办用户