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

cjl

2024-04-18 67a5f2c9689d38b5b1533888829b7f9bbf0c3ba8

 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>