From b6b746a7e0798c7e76c9cd8f69f9a537315253c9 Mon Sep 17 00:00:00 2001
From: zhuo <2089219845@qq.com>
Date: 星期二, 04 三月 2025 10:09:36 +0800
Subject: [PATCH] Merge branch 'dev_dz' into dev

---
 ruoyi-system/src/main/resources/mapper/system/UserMapper.xml |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/ruoyi-system/src/main/resources/mapper/system/UserMapper.xml b/ruoyi-system/src/main/resources/mapper/system/UserMapper.xml
index 6487371..922251a 100644
--- a/ruoyi-system/src/main/resources/mapper/system/UserMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/UserMapper.xml
@@ -49,7 +49,7 @@
     </select>
 
     <!-- 鑾峰彇褰撳墠鐧诲綍鐢ㄦ埛淇℃伅 -->
-    <select id="getUserNow" resultType="com.ruoyi.common.core.domain.entity.User">
+    <select id="getUserNow" resultType="com.ruoyi.system.domain.vo.UserVo">
         select u.id,
                c.company,
                u.name,

--
Gitblit v1.9.3