From f8c33ad3fb09dd0f70b68b74d59ce28761142bf0 Mon Sep 17 00:00:00 2001
From: Van333 <van666666@foxmail.com>
Date: 星期一, 14 十一月 2022 15:21:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/xm-20221107' into xm-20221107

---
 dao/src/main/java/com/sandu/ximon/dao/enums/MenuEnum.java |   16 ++++++++++++++--
 1 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/dao/src/main/java/com/sandu/ximon/dao/enums/MenuEnum.java b/dao/src/main/java/com/sandu/ximon/dao/enums/MenuEnum.java
index dd6f01c..7c70fd2 100644
--- a/dao/src/main/java/com/sandu/ximon/dao/enums/MenuEnum.java
+++ b/dao/src/main/java/com/sandu/ximon/dao/enums/MenuEnum.java
@@ -37,7 +37,6 @@
     AIR_DATA_LIST("澶ф皵鏁版嵁鍒楄〃"),
     AIR_DATA_LIST_HISTORY("澶ф皵鏁版嵁鍘嗗彶"),
     AIR_EQUIPMENT_NONG_GENG_LIST("澶ф皵璁惧鍐滆�曞垪琛�"),
-    AIR_DATA__NONG_GENG_LIST("澶ф皵鏁版嵁鍐滆�曞垪琛�"),
     WATER_EQUIPMENT_LIST("姘磋川璁惧鍒楄〃"),
     WATER_DATA_LIST("姘磋川鏁版嵁鍒楄〃"),
     IP_BROADCAST_LIST("IP闊虫煴鍒楄〃"),
@@ -235,7 +234,20 @@
     C3_REFUND("鍏呯數妗╅��娆�"),
     CHARGE_UPDATE("缂栬緫璐圭巼"),
     ORDER_LIST("璁㈠崟鍒楄〃"),
-    CHARGE_LIST("鑾峰彇璐圭巼");
+    CHARGE_LIST("鑾峰彇璐圭巼"),
+    LED_NEW_FILE_UPLOAD("鏂拌鐡︽枃浠朵笂浼�"),
+    LED_NEW_FILE_LIST("鏂拌鐡︽枃浠跺垪琛�"),
+    LED_NEW_FILE_ADD("鏂拌鐡︽枃浠舵柊澧�"),
+    LED_NEW_FILE_DEL("鏂拌鐡︽枃浠跺垹闄�"),
+    LED_NEW_ADD("鏂拌鐡﹀睆骞曟柊澧�"),
+    LED_NEW_EDIT("鏂拌鐡﹀睆骞曠紪杈�"),
+    LED_NEW_DEL("鏂拌鐡﹀睆骞曞垹闄�"),
+    LED_NEW_LIST("鏂拌鐡﹀睆骞曞垪琛�"),
+    LED_NEW_INFO("鏂拌鐡﹀睆骞曡鎯�"),
+    LED_NEW_VOL("鏂拌鐡﹂煶閲忚皟鑺�"),
+    LED_NEW_BRIGHTNESS("鏂拌鐡︿寒搴﹁皟鑺�"),
+    LED_NEW_POWER("鏂拌鐡﹀紑鍏宠皟鑺�"),
+    ;
 
 
     private final String code;

--
Gitblit v1.9.3