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

cjl

2023-11-01 23ad681499f8652fe4e2084e6492ececb6fc7551

 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