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

jinpengyong

2023-11-14 931734244f977a65dd35c6f606afb999d7c3c967

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

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

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

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

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

    ;

    @EnumValue