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

jinpengyong

2023-08-11 010f4ba252db180fc7fea4d7cb1b84a0bca7479f

 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;