From 7044df54b1809b1b09e8f20cdf9aef653f9ed12a Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期四, 27 十月 2022 11:02:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/haucheng_panzhihua' into haucheng_panzhihua

---
 flower_city/src/main/java/com/dg/core/db/gen/mapper/HuaChengSysUserMapper.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/flower_city/src/main/java/com/dg/core/db/gen/mapper/HuaChengSysUserMapper.java b/flower_city/src/main/java/com/dg/core/db/gen/mapper/HuaChengSysUserMapper.java
index 1a04d49..47e2e34 100644
--- a/flower_city/src/main/java/com/dg/core/db/gen/mapper/HuaChengSysUserMapper.java
+++ b/flower_city/src/main/java/com/dg/core/db/gen/mapper/HuaChengSysUserMapper.java
@@ -18,7 +18,7 @@
 {
     public List<HuaChengSysUser> selectConfigList();
 
-    public HuaChengSysUser selectData(@Param("userId") String userId,@Param("account")  String account,@Param("phone") String phone);
+    public List<HuaChengSysUser> selectData(@Param("userId") String userId,@Param("account")  String account,@Param("phone") String phone);
 
     public int selectNum();
 }

--
Gitblit v1.7.1