From f86b4032c5824c4e69821ce9b795e8a7c236c799 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Fri, 27 Oct 2023 08:56:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wb' into qa

---
 screen-api/src/main/java/com/moral/api/pojo/enums/SysDictTypeEnum.java |    4 ++++
 1 files changed, 4 insertions(+), 0 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 5e9619b..4b91bf2 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
@@ -29,6 +29,10 @@
      *ZHC_RANGE
      */
     SYS_SECOND_CRUISER_RANGE("ZHCRANGE","���������������������"),
+    /**
+     *UAV_RANGE
+     */
+    SYS_SECOND_UAV_RANGE("UAVRANGE","���������������������"),
 
     /**
      *WIND

--
Gitblit v1.8.0