From eb6fc0ebcfe457fc30f65e8dfb15b8b05bebda51 Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期二, 18 十月 2022 10:17:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test

---
 flower_city/src/main/java/com/dg/core/service/ISysUserService.java |    3 ++-
 1 files changed, 2 insertions(+), 1 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..84061b7 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
@@ -17,7 +17,7 @@
     public List<SysUser> selectConfigList(IPage<SysUser> page, Integer state,String userType);
 
 
-    SysUser selectData(String userId);
+    SysUser selectData(String userId,String phonenumber);
 
     /**
      * 新增聊天记录
@@ -78,6 +78,7 @@
      */
     ResultData loginByPhonenumber(String phonenumber);
 
+
     /**
      * 查询用户列表(不分页)
      * @param userType 用户类型

--
Gitblit v1.7.1