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

cjl

2023-10-07 9e50775009199ee04ac7bbd67fb0ef91b195c701

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

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


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

}