From f1c3c5f0b840df7fa5fe08a69186c9f2b52ce243 Mon Sep 17 00:00:00 2001
From: lizijie <lzjiiie@163.com>
Date: Thu, 18 Mar 2021 15:37:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
screen-manage/src/main/java/com/moral/api/service/ManageAccountService.java | 43 +++++++++++++++++++++++++++++++++----------
1 files changed, 33 insertions(+), 10 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/service/ManageAccountService.java b/screen-manage/src/main/java/com/moral/api/service/ManageAccountService.java
index 5ae39df..3f1aa80 100644
--- a/screen-manage/src/main/java/com/moral/api/service/ManageAccountService.java
+++ b/screen-manage/src/main/java/com/moral/api/service/ManageAccountService.java
@@ -2,13 +2,9 @@
import com.moral.api.entity.ManageAccount;
import com.baomidou.mybatisplus.extension.service.IService;
-import com.moral.api.pojo.dto.AccountDTO;
-import com.moral.api.pojo.dto.LoginDTO;
-import com.moral.api.pojo.request.AccountAddRequest;
-import com.moral.api.pojo.request.LoginRequest;
-import com.moral.api.pojo.request.LogoutRequest;
-
-import java.util.Map;
+import com.moral.api.pojo.dto.account.*;
+import com.moral.api.pojo.dto.login.LoginDTO;
+import com.moral.api.pojo.form.*;
/**
* <p>
@@ -26,7 +22,7 @@
* @Author: ���������
* @Date: 2021/3/12
*/
- LoginDTO login(LoginRequest loginRequest);
+ LoginDTO login(LoginForm loginForm);
/**
* @Description: ������
@@ -35,7 +31,7 @@
* @Author: ���������
* @Date: 2021/3/12
*/
- boolean logout(LogoutRequest logoutRequest);
+ boolean logout(LogoutForm logoutForm);
/**
* @Description: ������������������
@@ -44,5 +40,32 @@
* @Author: ���������
* @Date: 2021/3/13
*/
- AccountDTO addAccount(AccountAddRequest accountAddRequest);
+ AccountInsertDTO insertAccount(AccountInsertForm accountInsertForm);
+
+ /**
+ * @Description: ������������
+ * @Param: [accountQueryRequest]
+ * @return: com.moral.api.pojo.dto.AccountDTO
+ * @Author: ���������
+ * @Date: 2021/3/15
+ */
+ AccountQueryDTO queryAccount(AccountQueryForm accountQueryForm);
+
+ /**
+ * @Description: ������������
+ * @Param: [accountUpdateRequest]
+ * @return: com.moral.api.pojo.dto.account.AccountDTO
+ * @Author: ���������
+ * @Date: 2021/3/15
+ */
+ AccountUpdateDTO updateAccount(AccountUpdateForm accountUpdateForm);
+
+ /**
+ * @Description: ������������
+ * @Param: [accountDeleteRequest]
+ * @return: com.moral.api.pojo.dto.account.AccountDeleteDTO
+ * @Author: ���������
+ * @Date: 2021/3/16
+ */
+ AccountDeleteDTO deleteAccount(AccountDeleteForm accountDeleteForm);
}
--
Gitblit v1.8.0