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

jinpengyong

2021-09-10 c8aa05fd65cc788abc0f44494338b04993e3b4be

 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;

/**