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

cjl

2023-07-07 1e6dbe352c35a54c299008c523e38b1e59d1ea03

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

}