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

jinpengyong

2023-11-10 4686da41b376617f6d447b3546c045ce54f032fa

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

@@ -46,6 +46,7 @@
    /*
    * 1：系统内置，无法更改 0：可以更改
    * */
    @TableField("`system`")
    private Integer system;

    /**
@@ -63,10 +64,5 @@
     */
    private String isDelete;


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

}