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/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