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 | 26 ++++++++++++++++----------
1 files changed, 16 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 471d22d..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,12 +2,9 @@
import com.moral.api.entity.ManageAccount;
import com.baomidou.mybatisplus.extension.service.IService;
-import com.moral.api.pojo.dto.account.AccountDTO;
-import com.moral.api.pojo.dto.account.AccountInsertDTO;
-import com.moral.api.pojo.dto.account.AccountQueryDTO;
-import com.moral.api.pojo.dto.account.AccountUpdateDTO;
+import com.moral.api.pojo.dto.account.*;
import com.moral.api.pojo.dto.login.LoginDTO;
-import com.moral.api.pojo.request.*;
+import com.moral.api.pojo.form.*;
/**
* <p>
@@ -25,7 +22,7 @@
* @Author: ���������
* @Date: 2021/3/12
*/
- LoginDTO login(LoginRequest loginRequest);
+ LoginDTO login(LoginForm loginForm);
/**
* @Description: ������
@@ -34,7 +31,7 @@
* @Author: ���������
* @Date: 2021/3/12
*/
- boolean logout(LogoutRequest logoutRequest);
+ boolean logout(LogoutForm logoutForm);
/**
* @Description: ������������������
@@ -43,7 +40,7 @@
* @Author: ���������
* @Date: 2021/3/13
*/
- AccountInsertDTO insertAccount(AccountInsertRequest accountInsertRequest);
+ AccountInsertDTO insertAccount(AccountInsertForm accountInsertForm);
/**
* @Description: ������������
@@ -52,7 +49,7 @@
* @Author: ���������
* @Date: 2021/3/15
*/
- AccountQueryDTO queryAccount(AccountQueryRequest accountQueryRequest);
+ AccountQueryDTO queryAccount(AccountQueryForm accountQueryForm);
/**
* @Description: ������������
@@ -61,5 +58,14 @@
* @Author: ���������
* @Date: 2021/3/15
*/
- AccountUpdateDTO updateAccount(AccountUpdateRequest accountUpdateRequest);
+ 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