From 931734244f977a65dd35c6f606afb999d7c3c967 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Tue, 14 Nov 2023 11:37:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wb' into qa

---
 screen-api/src/main/java/com/moral/api/pojo/enums/SysDictTypeEnum.java |   23 ++++++++++++++++++++++-
 1 files changed, 22 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 7128169..6137328 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,7 +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","������������������"),
+
+    SYS_AMEND("AMEND","������������������������"),
 
     ;
 

--
Gitblit v1.8.0