From 6e6f4887eaeb046ccdc76a79375a8c7ff47daa96 Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期五, 21 十月 2022 17:52:18 +0800
Subject: [PATCH] Merge branch 'zigonggao_dev' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into zigonggao_dev

---
 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 c4fe217..c4b69ad 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
@@ -32,7 +32,9 @@
 
 
 
-    SysUser selectData(@Param("userId") String userId,@Param("phonenumber") String phonenumber);
+    SysUser selectData(@Param("userId") String userId,
+                       @Param("phonenumber") String phonenumber,
+                       @Param("loginName") String loginName);
 
 
     /**
@@ -80,5 +82,5 @@
      * @param userType 用户类型
      * @return 结果
      */
-    List<SysUser>  queryList(@Param("userType") Integer userType);
+    List<SysUser>  queryList(@Param("userType") Integer userType,String keyWord);
 }

--
Gitblit v1.7.1