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

jinpengyong

2023-09-28 bec26ab287b22ed9ba6eaa4da64d91a374fdc14d

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

}