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

jinpengyong

2023-10-25 02a6c170797c5d2750ed07b21f22396a7683c54e

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

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

    /**