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

cjl

2023-09-06 4a4db8924da0782d0b698f7585ad6b0577bdca2d

 screen-api/src/main/java/com/moral/api/entity/User.java

@@ -101,9 +101,4 @@
    private String isDelete;


    @Override
    protected Serializable pkVal() {
        return this.id;
    }

}