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

cjl

2023-12-14 6992aaf0587c09f7c511c1afd12e1519d91363d3

 screen-api/src/main/java/com/moral/api/pojo/enums/SysDictTypeEnum.java

@@ -41,6 +41,7 @@

    SYS_DEVICE("DEVICE","设备秒机数据"),

    SYS_AMEND("AMEND","立行立改修改数据"),

    ;