From baf2d29c0c8ec7329966a1af44ac9dd8f4b05e9c Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期一, 24 十月 2022 13:43:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
flower_city/src/main/java/com/dg/core/service/ISysUserService.java | 2 +-
1 files changed, 1 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 f97f496..218bf8f 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,String userName);
- SysUser selectData(String userId,String phonenumber);
+ SysUser selectData(String userId,String phonenumber,String loginName);
/**
* 新增聊天记录
--
Gitblit v1.7.1