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/service/ISysUserService.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/flower_city/src/main/java/com/dg/core/service/ISysUserService.java b/flower_city/src/main/java/com/dg/core/service/ISysUserService.java
index 84061b7..e0f3f76 100644
--- a/flower_city/src/main/java/com/dg/core/service/ISysUserService.java
+++ b/flower_city/src/main/java/com/dg/core/service/ISysUserService.java
@@ -14,7 +14,7 @@
*
* @return 参数配置信息
*/
- public List<SysUser> selectConfigList(IPage<SysUser> page, Integer state,String userType);
+ public List<SysUser> selectConfigList(IPage<SysUser> page, Integer state,String userType,String userName);
SysUser selectData(String userId,String phonenumber);
@@ -48,7 +48,7 @@
*
* @return 结果
*/
- public int selectNum(String userType);
+ public int selectNum(String userType,String userName);
/**
* 发送验证码(如果没有该用户则新建用户)
--
Gitblit v1.7.1