From bdbe40f077aa9ca2ec184707d3eab41af13def03 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期四, 10 十一月 2022 18:12:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zigonggao_dev' into zigonggao_dev
---
flower_city/src/main/java/com/dg/core/controller/UserController.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/flower_city/src/main/java/com/dg/core/controller/UserController.java b/flower_city/src/main/java/com/dg/core/controller/UserController.java
index 4623353..764bbb4 100644
--- a/flower_city/src/main/java/com/dg/core/controller/UserController.java
+++ b/flower_city/src/main/java/com/dg/core/controller/UserController.java
@@ -246,7 +246,7 @@
config.setUserId(user.getUserId());
config.setCreateBy(user.getUserId()+"");
config.setUserType("3");
-
+ config.setIsDivisionHead("1");
config.setUpdateTime(LocalDateTime.now());
return toAjax(IUserService.updateConfig(config));
}
@@ -264,7 +264,7 @@
config.setUserId(user2.getUserId());
config.setCreateBy(user2.getUserId()+"");
config.setUserType("3");
-
+ config.setIsDivisionHead("1");
config.setUpdateTime(LocalDateTime.now());
return toAjax(IUserService.updateConfig(config));
}
@@ -278,6 +278,7 @@
config.setCreateBy(sysUser.getUserId()+"");
config.setUserId(Snowflake.getId()+"");
config.setUserType("3");
+ config.setIsDivisionHead("1");
config.setCreateTime(LocalDateTime.now());
config.setUpdateTime(LocalDateTime.now());
--
Gitblit v1.7.1