Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into dev

kaiyu

2021-10-18 5586964c3e63f95c9e460a6a3d85d7dca408e096

 screen-manage/src/main/java/com/moral/api/pojo/vo/login/AccountInfoVO.java

@@ -4,7 +4,7 @@
import com.moral.api.entity.ManageAccount;
import com.moral.api.entity.ManageMenu;
import com.moral.api.entity.ManageRole;
import com.moral.api.pojo.dto.login.AccountInfoDTO;
import com.moral.api.pojo.redisBean.AccountInfoDTO;
import lombok.Data;
import org.springframework.util.ObjectUtils;