From 7f9d058a0e632be6a3daf6f46d26b69742db0720 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期三, 08 十一月 2023 13:13:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zycrm' into zycrm

---
 src/main/java/com/zy/crm/system/controller/UserController.java |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/zy/crm/system/controller/UserController.java b/src/main/java/com/zy/crm/system/controller/UserController.java
index 28f21dd..4ab50a0 100644
--- a/src/main/java/com/zy/crm/system/controller/UserController.java
+++ b/src/main/java/com/zy/crm/system/controller/UserController.java
@@ -137,6 +137,7 @@
             // todo: 淇敼鍏宠仈鏁版嵁鐨刣eptId瀛楁
             cstmrService.updateDeptIdByUserId(user.getId(), user.getDeptId());
         }
+        user.setNickname(user.getUsername());
         if (!userService.updateById(user)) {
             throw new CoolException("淇敼鐢ㄦ埛澶辫触");
         }

--
Gitblit v1.9.1