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

cjl

2023-08-11 eb6d41359a8957c6355275f7697db202d6a523db

 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;
    }

}