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

cjl

2023-10-25 8af1bd5ed227ff568b3ac60f3594ae2a8dfd9dec

 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>