From a270a93b42e94f789962b6e0d3ac16e5619bf5f9 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期三, 19 十月 2022 14:10:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test

---
 flower_city/src/main/java/com/dg/core/db/gen/mapper/SysUserMapper.java |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/flower_city/src/main/java/com/dg/core/db/gen/mapper/SysUserMapper.java b/flower_city/src/main/java/com/dg/core/db/gen/mapper/SysUserMapper.java
index 4e4471b..c4fe217 100644
--- a/flower_city/src/main/java/com/dg/core/db/gen/mapper/SysUserMapper.java
+++ b/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获取导办用户

--
Gitblit v1.7.1