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

cjl

2023-11-01 856f1cf8ee52443ce616ce00ecff7cbb7c30f000

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

@@ -29,11 +29,19 @@
     *ZHC_RANGE
     */
    SYS_SECOND_CRUISER_RANGE("ZHCRANGE","走航车组织范围"),
    /**
     *UAV_RANGE
     */
    SYS_SECOND_UAV_RANGE("UAVRANGE","无人机组织范围"),

    /**
     *WIND
     */
    WIND_FARM_SCOPE("WIND","风场范围"),

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


    ;

    @EnumValue