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

cjl

2024-04-18 67a5f2c9689d38b5b1533888829b7f9bbf0c3ba8

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

@@ -41,6 +41,9 @@

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

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

    SYS_HAND_DEVICE("HANDDEVICE","手持设备数据"),

    ;