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

jinpengyong

2021-06-24 06b00a178d194d33370e44410c4f04a4164f86c7

 screen-manage/src/main/java/com/moral/api/pojo/dto/login/LoginDTO.java

@@ -1,5 +1,6 @@
package com.moral.api.pojo.dto.login;

import com.moral.api.pojo.redisBean.AccountInfoDTO;
import lombok.Data;

/**