From f342a0d88b2a7168f794d0cf545d16a3138acb6d Mon Sep 17 00:00:00 2001
From: wuqiping <wuqiping@qq.com>
Date: Wed, 09 Jun 2021 15:55:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
screen-manage/src/main/java/com/moral/api/pojo/vo/login/LoginVO.java | 14 ++------------
1 files changed, 2 insertions(+), 12 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/pojo/vo/login/LoginVO.java b/screen-manage/src/main/java/com/moral/api/pojo/vo/login/LoginVO.java
index 52878a0..bf15054 100644
--- a/screen-manage/src/main/java/com/moral/api/pojo/vo/login/LoginVO.java
+++ b/screen-manage/src/main/java/com/moral/api/pojo/vo/login/LoginVO.java
@@ -1,11 +1,10 @@
package com.moral.api.pojo.vo.login;
import com.fasterxml.jackson.annotation.JsonInclude;
-import com.moral.api.pojo.dto.login.AccountInfoDTO;
+import com.moral.api.pojo.redisBean.AccountInfoDTO;
import com.moral.api.pojo.dto.login.LoginDTO;
import com.moral.constant.ResponseCodeEnum;
import lombok.Data;
-import org.springframework.util.ObjectUtils;
/**
* @ClassName LoginVo
@@ -24,11 +23,6 @@
* */
private String token;
- /*
- * ������������������
- * */
- private AccountInfoVO accountInfoVO;
-
/**
* @Description: DTO������VO
* @Param: [dto]
@@ -41,11 +35,7 @@
return null;
LoginVO vo = new LoginVO();
- String token = dto.getToken();
- AccountInfoDTO accountInfoDTO = dto.getAccountInfoDTO();
- AccountInfoVO accountInfoVO = AccountInfoVO.convert(accountInfoDTO);
- vo.setAccountInfoVO(accountInfoVO);
- vo.setToken(token);
+ vo.setToken(dto.getToken());
return vo;
}
}
--
Gitblit v1.8.0