From b69d2017fecdad6a1c9a09c0006e70ecea9efed0 Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期一, 17 十月 2022 18:39:41 +0800
Subject: [PATCH] Merge branch 'zigonggao_dev' into huacheng_test

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

diff --git a/flower_city/src/main/java/com/dg/core/db/gen/mapper/SysUserMapper.java b/flower_city/src/main/java/com/dg/core/db/gen/mapper/SysUserMapper.java
index 112b146..4e4471b 100644
--- a/flower_city/src/main/java/com/dg/core/db/gen/mapper/SysUserMapper.java
+++ b/flower_city/src/main/java/com/dg/core/db/gen/mapper/SysUserMapper.java
@@ -18,6 +18,7 @@
 public interface SysUserMapper extends BaseMapper<SysUser> {
 
     SysUser getUserById(Long id);
+
     SysUser getUserByAccount(String account);
 
     /**
@@ -29,7 +30,7 @@
 
 
 
-    SysUser selectData(String userId);
+    SysUser selectData(@Param("userId") String userId,@Param("phonenumber") String phonenumber);
 
 
     /**

--
Gitblit v1.7.1