From 45a27814a10252ebc36e435aee5ca3a4b3decdc4 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期三, 26 十月 2022 13:40:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test

---
 flower_city/src/main/java/com/dg/core/service/impl/HuaChengSysUserImpl.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/flower_city/src/main/java/com/dg/core/service/impl/HuaChengSysUserImpl.java b/flower_city/src/main/java/com/dg/core/service/impl/HuaChengSysUserImpl.java
index 1bd13b1..0ee0e73 100644
--- a/flower_city/src/main/java/com/dg/core/service/impl/HuaChengSysUserImpl.java
+++ b/flower_city/src/main/java/com/dg/core/service/impl/HuaChengSysUserImpl.java
@@ -18,7 +18,7 @@
     }
 
     @Override
-    public HuaChengSysUser selectData(String userId,String account,String phone) {
+    public List<HuaChengSysUser> selectData(String userId,String account,String phone) {
         return baseMapper.selectData(userId,account,phone);
     }
 

--
Gitblit v1.7.1