From a9cf56a7be8b5e27e2c3dcb416b734093e7a8dc3 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期三, 28 一月 2026 12:54:15 +0800
Subject: [PATCH] Merge branch 'rcs_master' into ctu_conveyor

---
 zy-acs-manager/src/main/java/com/zy/acs/manager/system/controller/param/UpdatePasswordParam.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/system/controller/param/UpdatePasswordParam.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/system/controller/param/UpdatePasswordParam.java
index 17b15a6..f6c6819 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/system/controller/param/UpdatePasswordParam.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/system/controller/param/UpdatePasswordParam.java
@@ -11,6 +11,6 @@
 
     private String oldPassword;
 
-    private String password;
+    private String newPassword;
 
 }

--
Gitblit v1.9.1