From 5a8ae920dace571fbf0858f48354d3bc697e6340 Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期三, 09 十一月 2022 18:02:53 +0800
Subject: [PATCH] Merge branch 'zigonggao_dev' into huacheng_test
---
flower_city/src/main/java/com/dg/core/service/ISysUserService.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 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 ef2d3c7..ad5aa5d 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,11 @@
*
* @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,List<String> ids);
- SysUser selectData(String userId,String phonenumber);
+ SysUser selectData(String userId,String phonenumber,String loginName);
/**
* 新增聊天记录
@@ -48,7 +49,7 @@
*
* @return 结果
*/
- public int selectNum(String userType);
+ public int selectNum(String userType,String userName,List<String> ids);
/**
* 发送验证码(如果没有该用户则新建用户)
@@ -78,12 +79,13 @@
*/
ResultData loginByPhonenumber(String phonenumber);
+
/**
* 查询用户列表（不分页）
* @param userType 用户类型
* @return 结果
*/
- List<SysUser> queryList(Integer userType);
+ List<SysUser> queryList(Integer userType,String keyWor);
}
--
Gitblit v1.7.1