From dd730295a1df836c872d22a69a816f52e4c5d431 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期三, 19 十月 2022 15:05:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
flower_city/src/main/java/com/dg/core/service/ISysUserService.java | 7 ++++---
1 files changed, 4 insertions(+), 3 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 c6e3036..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,10 +14,10 @@
*
* @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);
+ SysUser selectData(String userId,String phonenumber);
/**
* 新增聊天记录
@@ -48,7 +48,7 @@
*
* @return 结果
*/
- public int selectNum(String userType);
+ public int selectNum(String userType,String userName);
/**
* 发送验证码(如果没有该用户则新建用户)
@@ -78,6 +78,7 @@
*/
ResultData loginByPhonenumber(String phonenumber);
+
/**
* 查询用户列表（不分页）
* @param userType 用户类型
--
Gitblit v1.7.1