From 7c91dfbf9a20e9be807a359736b0c7a741d640ba Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期五, 21 十月 2022 16:50:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
flower_city/src/main/java/com/dg/core/controller/GuideDoController.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/flower_city/src/main/java/com/dg/core/controller/GuideDoController.java b/flower_city/src/main/java/com/dg/core/controller/GuideDoController.java
index 5eb13b5..4e38b2e 100644
--- a/flower_city/src/main/java/com/dg/core/controller/GuideDoController.java
+++ b/flower_city/src/main/java/com/dg/core/controller/GuideDoController.java
@@ -95,7 +95,7 @@
config.setUserType("2");
- SysUser user=IUserService.selectData(null,config.getPhonenumber());
+ SysUser user=IUserService.selectData(null,config.getPhonenumber(),null);
if (user != null)
{
user.setPassword(config.getPassword());
--
Gitblit v1.7.1