From aff62e24d29b010d6de109a260854d9eaaf1e3ed Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期四, 17 十一月 2022 14:25:22 +0800
Subject: [PATCH] Merge branch 'zigonggao_dev' 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