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

cjl

2023-10-10 9699bc8502d9bffd382a27fb4156bb777bce4453

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

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


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

}