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

cjl

2023-10-25 8af1bd5ed227ff568b3ac60f3594ae2a8dfd9dec

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

@@ -20,8 +20,19 @@
     */
    SYS_JBD("JBD", "交办单"),

    SYS_SECOND_CRUISER("ZHC","秒级走航车"),
    /**
     *ZHC
     */
    SYS_SECOND_CRUISER("ZHC","秒级走航车高值范围"),

    /**
     *ZHC_RANGE
     */
    SYS_SECOND_CRUISER_RANGE("ZHCRANGE","走航车组织范围"),

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