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

cjl

2023-11-14 3771512ff8b1f4bd6c40cdcdff58b3a64cee78b1

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

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


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

}