From b665e22a3dbc525493a39ff02861e149e3fa7dd0 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期二, 22 十一月 2022 15:37:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
flower_city/src/main/java/com/dg/core/controller/GuideDoController.java | 1 -
1 files changed, 0 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 6944e7a..857e426 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
@@ -131,7 +131,6 @@
user.setMattersIds(config.getMattersIds());
user.setMasterNames(config.getMasterNames());
user.setMattersNames(config.getMattersNames());
- user.setMasterIds(config.getMasterIds());
//提示用户名或密码错误
return toAjax(IUserService.updateConfig(user));
}
--
Gitblit v1.7.1