From 379222715511cc4d6efd4abbbb3463f5485f590d Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期二, 11 三月 2025 10:27:30 +0800
Subject: [PATCH] Merge branch 'dev_cr' into dev

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

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/UserController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/UserController.java
index e93f447..53ee93f 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/UserController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/UserController.java
@@ -33,7 +33,7 @@
     private HeaderToken headerToken;
 
     /**
-     * todo:  type : 1: 鑾峰彇妫�娴嬩汉鍛樹俊鎭�
+     *type : 1: 鑾峰彇妫�娴嬩汉鍛樹俊鎭�
      type : 2: 鑾峰彇褰撳墠閮ㄩ棬(瀹為獙瀹や汉鍛�)
      * @param user
      * @param type

--
Gitblit v1.9.3