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

cjl

2023-11-08 5c1d58556e9cd4c7603b5e16dc1640f61623af0b

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

@@ -39,7 +39,9 @@
     */
    WIND_FARM_SCOPE("WIND","风场范围"),

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


    ;

    @EnumValue