From 87172c08a55e972ff850ab3542858d11d66505ca Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Wed, 01 Nov 2023 16:21:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 screen-api/src/main/java/com/moral/api/pojo/enums/SysDictTypeEnum.java |   21 ++++++++++++++++++++-
 1 files changed, 20 insertions(+), 1 deletions(-)

diff --git a/screen-api/src/main/java/com/moral/api/pojo/enums/SysDictTypeEnum.java b/screen-api/src/main/java/com/moral/api/pojo/enums/SysDictTypeEnum.java
index 72778ab..c98bd8e 100644
--- a/screen-api/src/main/java/com/moral/api/pojo/enums/SysDictTypeEnum.java
+++ b/screen-api/src/main/java/com/moral/api/pojo/enums/SysDictTypeEnum.java
@@ -20,9 +20,28 @@
      */
     SYS_JBD("JBD", "���������"),
 
-    SYS_SECOND_CRUISER("ZHC","���������������"),
+    /**
+     *ZHC
+     */
+    SYS_SECOND_CRUISER("ZHC","���������������������������"),
 
+    /**
+     *ZHC_RANGE
+     */
+    SYS_SECOND_CRUISER_RANGE("ZHCRANGE","���������������������"),
+    /**
+     *UAV_RANGE
+     */
+    SYS_SECOND_UAV_RANGE("UAVRANGE","���������������������"),
+
+    /**
+     *WIND
+     */
     WIND_FARM_SCOPE("WIND","������������"),
+
+    SYS_DEVICE("DEVICE","������������������"),
+
+
     ;
 
     @EnumValue

--
Gitblit v1.8.0