From af5081bc0d0668d526a204076557a171097ddb8d Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期四, 05 二月 2026 14:02:59 +0800
Subject: [PATCH] Merge branch 'refs/heads/rcs_master' into ctu_conveyor

---
 zy-acs-manager/src/main/java/com/zy/acs/manager/system/service/UserService.java |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/system/service/UserService.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/system/service/UserService.java
index 10ef2ed..44d56a0 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/system/service/UserService.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/system/service/UserService.java
@@ -19,4 +19,6 @@
 
     String encodePassword(String password);
 
+    User setUserAuthInfo(User user);
+
 }

--
Gitblit v1.9.1