From eb07dec15baddab47a4b879a7b1841285b835a49 Mon Sep 17 00:00:00 2001
From: zhuo <2089219845@qq.com>
Date: 星期五, 14 三月 2025 13:11:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_dz' into dev_dz
---
ruoyi-system/src/main/java/com/ruoyi/system/service/UserService.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/UserService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/UserService.java
index b75fdb4..c0d0abe 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/UserService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/UserService.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.common.core.domain.entity.User;
+import com.ruoyi.system.domain.vo.UserVo;
import java.util.List;
@@ -26,7 +27,7 @@
* 鑾峰彇褰撳墠鐧诲綍鐨勫鎴蜂俊鎭�
* @return
*/
- User getUserNow();
+ UserVo getUserNow();
/**
* 鑾峰彇褰撳墠鐧诲綍鐢ㄦ埛閮ㄩ棬
--
Gitblit v1.9.3