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

jinpengyong

2023-08-04 b5a2fc07527ab700544f3b7ba0be01b2e015e2db

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

}