From 08429736fe89c3c3a988d794f7cb6c0170d18afa Mon Sep 17 00:00:00 2001
From: LHN <31457034@qq.com>
Date: 星期三, 19 十月 2022 16:34:19 +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 a82ada4..1df944d 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
@@ -64,6 +64,7 @@
BANNER("寰俊logo"),
POLE_LIST("鐏潌鍒楄〃"),
LIGHT_POLE_HEELING_LIST("鐏潌鍊炬枩"),
+ MQTT_TEST("MQTT娴嬭瘯"),
//鎸夐挳鏉冮檺
ADMIN_ADD("鏂板绠＄悊鍛�"),
@@ -74,6 +75,7 @@
AIR_QUERYVERSION("鏌ヨ杞‖浠剁増鏈�"),
AIR_REBOOT("杞噸鍚�"),
AIR_DATA_UPDATE("鎵嬪姩鏇存柊澶ф皵鏁版嵁"),
+ AIR_SET_TYPE("璁剧疆鍐滆�曡澶囩被鍨�"),
BANNER_ADD("娣诲姞寰俊logo"),
BANNER_UPDATE("缂栬緫寰俊logo"),
BANNER_DETAIL("鑾峰彇寰俊logo璇︽儏"),
@@ -232,10 +234,7 @@
C3_REFUND("鍏呯數妗╅��娆�"),
CHARGE_UPDATE("缂栬緫璐圭巼"),
ORDER_LIST("璁㈠崟鍒楄〃"),
- CHARGE_LIST("鑾峰彇璐圭巼")
-
-
- ;
+ CHARGE_LIST("鑾峰彇璐圭巼");
private final String code;
--
Gitblit v1.9.3