From ea94079e74182be590b9fff356c97f522d9a7828 Mon Sep 17 00:00:00 2001
From: MercuryZ <zdmisif@126.com>
Date: 星期二, 18 十月 2022 09:26:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
dao/src/main/java/com/sandu/ximon/dao/enums/MenuEnum.java | 7 +++----
1 files changed, 3 insertions(+), 4 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 5e05ea8..e34ef2c 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
@@ -26,6 +26,7 @@
GROUP_LIST("鍒嗙粍鍒楄〃"),
LIGHT_TASK_LIST("璺伅浠诲姟鍒楄〃"),
LIGHT_DATA("鍗曠伅鐩戞帶鏁版嵁"),
+ LIGHT_SETCALENDAR("鍗曠伅璁剧疆鏃ュ巻"),
LIGHT_ERROR_LIST("鍗曠伅鏁呴殰鍒楄〃"),
LED_LIST("LED灞忓垪琛�"),
LED_PROGRAM_LIST("鑺傜洰鍒楄〃"),
@@ -73,6 +74,7 @@
AIR_QUERYVERSION("鏌ヨ杞‖浠剁増鏈�"),
AIR_REBOOT("杞噸鍚�"),
AIR_DATA_UPDATE("鎵嬪姩鏇存柊澶ф皵鏁版嵁"),
+ AIR_SET_TYPE("璁剧疆鍐滆�曡澶囩被鍨�"),
BANNER_ADD("娣诲姞寰俊logo"),
BANNER_UPDATE("缂栬緫寰俊logo"),
BANNER_DETAIL("鑾峰彇寰俊logo璇︽儏"),
@@ -231,10 +233,7 @@
C3_REFUND("鍏呯數妗╅��娆�"),
CHARGE_UPDATE("缂栬緫璐圭巼"),
ORDER_LIST("璁㈠崟鍒楄〃"),
- CHARGE_LIST("鑾峰彇璐圭巼")
-
-
- ;
+ CHARGE_LIST("鑾峰彇璐圭巼");
private final String code;
--
Gitblit v1.9.3