From 03dfa1de5279c75a4206f59226d871823bdbe72e Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期二, 01 十一月 2022 10:59:41 +0800
Subject: [PATCH] Merge branch 'haucheng_panzhihua' into local_20221024

---
 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