From 71f3101370c3db0ec00178d51a723816c9bcddbd Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期六, 18 三月 2023 17:42:14 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server
---
ycl-common/src/main/java/com/ycl/service/user/UmsAdminService.java | 6 ++++--
1 files changed, 4 insertions(+), 2 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 5bb9f37..9fc5d34 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
@@ -4,7 +4,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ycl.dto.UmsAdminParam;
-import com.ycl.dto.UmsUserDto;
+import com.ycl.dto.user.UmsUserDto1;
import com.ycl.dto.UpdateAdminPasswordParam;
import com.ycl.entity.user.UmsAdmin;
import com.ycl.entity.user.UmsMenu;
@@ -29,6 +29,8 @@
* 娉ㄥ唽鍔熻兘
*/
UmsAdmin register(UmsAdminParam umsAdminParam);
+
+ void importExcl(UmsAdminParam umsAdminParam);
/**
* 鐧诲綍鍔熻兘
@@ -97,7 +99,7 @@
*/
IPage<UmsAdmin> pageUser(UserVO.PageUserVO pageUserVO);
- List<UmsUserDto> userExp();
+ List<UmsUserDto1> userExp();
/**
* 鎵归噺鍒犻櫎鐢ㄦ埛
--
Gitblit v1.8.0