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

wuqiping

2021-06-09 f342a0d88b2a7168f794d0cf545d16a3138acb6d

 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;

/**