Merge remote-tracking branch 'origin/dev' into dev

lizijie

2021-03-18 f1c3c5f0b840df7fa5fe08a69186c9f2b52ce243

 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);
}