Merge branch 'zigonggao_dev' into huacheng_test

fengjin

2022-10-21 1fb23cbeeaaeda0a66cf8fe8977c3f5915743cc7

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

@@ -26,7 +26,9 @@
     *
     * @return 参数配置信息
     */
    public List<SysUser> selectConfigList(IPage<SysUser> page, Integer state,@Param("userType") String userType);
    public List<SysUser> selectConfigList(IPage<SysUser> page, Integer state,
                                          @Param("userType") String userType,
                                          @Param("userName") String userName);



@@ -63,7 +65,7 @@
     *
     * @return 结果
     */
    public int selectNum(String userType);
    public int selectNum(@Param("userType") String userType,@Param("userName") String userName);

    /**
     * 根据部门id及分类id获取导办用户
@@ -78,5 +80,5 @@
     * @param userType 用户类型
     * @return 结果
     */
    List<SysUser>  queryList(@Param("userType") Integer userType);
    List<SysUser>  queryList(@Param("userType") Integer userType,String keyWord);
}