From 886552ad119e240366dc004bf287abfa75ed18f1 Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期三, 26 十月 2022 18:01:38 +0800
Subject: [PATCH] Merge branch 'huacheng_test' into haucheng_panzhihua

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

diff --git a/flower_city/src/main/java/com/dg/core/service/IHuaChengSysUserService.java b/flower_city/src/main/java/com/dg/core/service/IHuaChengSysUserService.java
index eec9ce3..94172b4 100644
--- a/flower_city/src/main/java/com/dg/core/service/IHuaChengSysUserService.java
+++ b/flower_city/src/main/java/com/dg/core/service/IHuaChengSysUserService.java
@@ -8,7 +8,7 @@
 {
     public List<HuaChengSysUser> selectConfigList();
 
-    public HuaChengSysUser selectData(String userId,String account,String phone);
+    public List<HuaChengSysUser> selectData(String userId,String account,String phone);
 
     public int selectNum();
 }

--
Gitblit v1.7.1