From 1b53eda9589c43fa1e4e8e2d01f29fa79e62aa51 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期二, 15 十一月 2022 16:40:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
flower_city/src/main/java/com/dg/core/controller/GuideDoController.java | 4 ++--
1 files changed, 2 insertions(+), 2 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 81f2f09..b24df3f 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
@@ -122,7 +122,7 @@
user.setRoleIds("2");
}
user.setUserType("2");
- user.setIsDivisionHead("1");
+ user.setIsDivisionHead(config.getIsDivisionHead());
user.setStatus(config.getStatus());
user.setUpdateTime(LocalDateTime.now());
//提示用户名或密码错误
@@ -140,7 +140,7 @@
config.setCreateTime(LocalDateTime.now());
config.setUpdateTime(LocalDateTime.now());
config.setUserId(Snowflake.getId()+"");
- config.setIsDivisionHead("1");
+ config.setIsDivisionHead(config.getIsDivisionHead());
return toAjax(IUserService.insertConfig(config));
}
--
Gitblit v1.7.1