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

@@ -29,7 +29,8 @@
    public List<SysUser> selectConfigList(IPage<SysUser> page, Integer state,
                                          @Param("userType") String userType,
                                          @Param("userName") String userName,
                                          @Param("ids") List<String> ids);
                                          @Param("ids") List<String> ids,
                                          @Param("isDivisionHead") String  isDivisionHead);



@@ -85,5 +86,5 @@
     * @param userType 用户类型
     * @return 结果
     */
    List<SysUser>  queryList(@Param("userType") Integer userType,String keyWord);
    List<SysUser>  queryList(@Param("userType") Integer userType,@Param("keyWord") String keyWord);
}