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

cjl

2023-07-24 7a734de6f72aa43cccddf74083ac134e41d1afff

 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;

/**