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

cjl

2023-12-14 6992aaf0587c09f7c511c1afd12e1519d91363d3

 screen-manage/src/main/java/com/moral/api/config/mybatis/wrapper/NullFilterWrapper.java

@@ -17,10 +17,10 @@
public class NullFilterWrapper<T> extends QueryWrapper<T> {

    @Override
    protected QueryWrapper<T> likeValue(boolean condition, String column, Object val, SqlLike sqlLike) {
    protected QueryWrapper<T> likeValue(boolean condition, SqlKeyword keyword, String column, Object val, SqlLike sqlLike) {
        if(val==null)
            condition = false;
        return super.likeValue(condition, column, val, sqlLike);
        return super.likeValue(condition, keyword, column, val, sqlLike);
    }

    @Override