From ca2a6d455604056ce628f296911f6abac85a7598 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期二, 15 七月 2025 09:54:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/ytflWms' into ytflWms
---
src/main/java/com/zy/system/controller/UserController.java | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/system/controller/UserController.java b/src/main/java/com/zy/system/controller/UserController.java
index a823f5a..3306946 100644
--- a/src/main/java/com/zy/system/controller/UserController.java
+++ b/src/main/java/com/zy/system/controller/UserController.java
@@ -117,6 +117,12 @@
if (user.getMobile()!=null) {
entity.setMobile(user.getMobile());
}
+ if(user.getRoleId() != null) {
+ entity.setRoleId(user.getRoleId());
+ }
+ if(user.getNickname()!=null) {
+ entity.setNickname(user.getNickname());
+ }
userService.updateById(entity);
return R.ok();
}
--
Gitblit v1.9.1