From 68af47f24bc344d2e1c5e1a848458b38679ddad4 Mon Sep 17 00:00:00 2001
From: fei <791364011@qq.com>
Date: 星期一, 06 十月 2025 08:39:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfAncestorController.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfAncestorController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfAncestorController.java
index a75dc70..e9690ca 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfAncestorController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfAncestorController.java
@@ -279,7 +279,7 @@
                 return error("鏂板绁栧厛1'" + usa.getNickName() + "'澶辫触锛岀櫥褰曡处鍙峰凡瀛樺湪");
             }
 
-            us.setPassword(SecurityUtils.encryptPassword(usa.getPassword()));
+            usa.setPassword(SecurityUtils.encryptPassword(usa.getPassword()));
             userService.insertUser(usa);
 
 

--
Gitblit v1.9.1