From 6ebf2b2a84b903f3600238dd084b3ae9ee4d6d3b Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Fri, 16 Apr 2021 17:33:07 +0800
Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into dev
---
screen-api/src/main/java/com/moral/api/service/UserService.java | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/service/UserService.java b/screen-api/src/main/java/com/moral/api/service/UserService.java
index 4ca4de2..5680a37 100644
--- a/screen-api/src/main/java/com/moral/api/service/UserService.java
+++ b/screen-api/src/main/java/com/moral/api/service/UserService.java
@@ -7,7 +7,8 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.moral.api.entity.User;
import com.baomidou.mybatisplus.extension.service.IService;
-import com.moral.api.pojo.UserBo;
+
+import com.moral.api.pojo.bo.UserBO;
/**
* <p>
@@ -21,14 +22,16 @@
Map<String, Object> login(Map<String, Object> parameters);
- Map<String, Object> addUser(User user, String token);
+ Map<String, Object> getMenus(Map<String, Object> parameters);
+
+ Map<String, Object> addUser(User user);
void deleteUser(User user);
- Map<String, Object> updateUser(User user, String token);
+ Map<String, Object> updateUser(User user);
Page<User> selectUsers(Map<String, Object> parameters);
- UserBo selectUserInfo(Map<String, Object> parameters);
+ UserBO selectUserInfo(Map<String, Object> parameters);
}
--
Gitblit v1.8.0