From 43b6ab16ed0480a09dce7b7c5a3ecdfbef3e41a5 Mon Sep 17 00:00:00 2001
From: baizonghao <1719256278@qq.com>
Date: 星期六, 04 三月 2023 12:07:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-common/src/main/java/com/ycl/service/user/UmsAdminService.java | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/ycl-common/src/main/java/com/ycl/service/user/UmsAdminService.java b/ycl-common/src/main/java/com/ycl/service/user/UmsAdminService.java
index 9386a8c..5f23c20 100644
--- a/ycl-common/src/main/java/com/ycl/service/user/UmsAdminService.java
+++ b/ycl-common/src/main/java/com/ycl/service/user/UmsAdminService.java
@@ -6,6 +6,7 @@
import com.ycl.dto.UmsAdminParam;
import com.ycl.dto.UpdateAdminPasswordParam;
import com.ycl.entity.user.UmsAdmin;
+import com.ycl.entity.user.UmsMenu;
import com.ycl.entity.user.UmsResource;
import com.ycl.entity.user.UmsRole;
import com.ycl.vo.user.UserVO;
@@ -72,7 +73,7 @@
/**
* 鑾峰彇鎸囧畾鐢ㄦ埛鐨勫彲璁块棶璧勬簮
*/
- List<UmsResource> getResourceList(Long adminId);
+ List<UmsMenu> getResourceList(Long adminId);
/**
* 淇敼瀵嗙爜
@@ -111,4 +112,5 @@
List<UmsAdmin> getDepartUser(Long departId);
+ String getTargetTo(String ids, String sendType);
}
--
Gitblit v1.8.0