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

cjl

2023-10-25 7e0534d52520407b1005e9a5f20945d927e92408

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

}