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

cjl

2023-11-01 23ad681499f8652fe4e2084e6492ececb6fc7551

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

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

    /**