From 9546646b1a4157da6acb396f786541ca5dd0e3a2 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 19 八月 2025 11:31:47 +0800
Subject: [PATCH] 合并代码
---
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TBranchOfficeController.java | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TBranchOfficeController.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TBranchOfficeController.java
index ace4df5..ecda26f 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TBranchOfficeController.java
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TBranchOfficeController.java
@@ -674,6 +674,7 @@
if (SinataUtil.isNotEmpty(tBranchOffice.getAccount()) && SinataUtil.isNotEmpty(tBranchOffice.getPassword())){
if(Objects.isNull(user)){
//添加User对象
+ user = new User();
user.setAccount(tBranchOffice.getAccount());
user.setSalt(ShiroKit.getRandomSalt(5));
user.setPassword(ShiroKit.md5(tBranchOffice.getPassword(), user.getSalt()));
--
Gitblit v1.7.1