From 218c85f5128b95cedcc20127c60d1915bb1f7bc6 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 06 三月 2025 16:33:12 +0800
Subject: [PATCH] Merge branch 'dev_zj' 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