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

jinpengyong

2023-11-10 4686da41b376617f6d447b3546c045ce54f032fa

 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