From 09cf27cc000267a7d23e3cf5d78ef690e603bdf3 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 20 九月 2024 10:49:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/iotda/enums/ServiceIdMenu.java |   14 +++++++++-----
 1 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/iotda/enums/ServiceIdMenu.java b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/iotda/enums/ServiceIdMenu.java
index 2445ebf..5146187 100644
--- a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/iotda/enums/ServiceIdMenu.java
+++ b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/iotda/enums/ServiceIdMenu.java
@@ -26,10 +26,10 @@
 	 * 读取实时监测数据
 	 */
 	 READ_REAL_TIME_MONITORING_DATA ("读取实时监测数据","read_real_time_monitoring_data"),
-	/**
-	 * 充电结束
-	 */
-	 END_CHARGE ("充电结束","end_charge"),
+//	/**
+//	 * 充电结束
+//	 */
+//	 END_CHARGE ("充电结束","end_charge"),
 	/**
 	 * 运营平台确认启动充电
 	 */
@@ -69,7 +69,11 @@
 	/**
 	 * 对时设置
 	 */
-	 TIMING_SETTING ("对时设置","timing_setting"),
+	TIMING_SETTING ("对时设置","timing_setting"),
+	/**
+	 * 对时设置应答
+	 */
+	 TIMING_SETTING_REPLY ("对时设置应答","timing_setting_reply"),
 	/**
 	 * 计费模型设置
 	 */

--
Gitblit v1.7.1