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

kaiyu

2021-06-18 4ad67c20b9c5e6625babefeee59ccee155cfc3aa

 screen-api/src/main/java/com/moral/api/mapper/UserMapper.java

@@ -4,7 +4,7 @@

import com.moral.api.entity.User;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.moral.api.pojo.UserBO;
import com.moral.api.pojo.bo.UserBO;

/**
 * <p>