From 48d5fe7eaad22768e6c64711c50c485e8176f6f9 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期五, 20 六月 2025 14:23:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 pipIrr-platform/pipIrr-mw/pipIrr-param-set/src/main/java/com/dy/pipIrrParamSet/paramSet/ParamKey.java |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-param-set/src/main/java/com/dy/pipIrrParamSet/paramSet/ParamKey.java b/pipIrr-platform/pipIrr-mw/pipIrr-param-set/src/main/java/com/dy/pipIrrParamSet/paramSet/ParamKey.java
index 4f87723..76f5fd6 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-param-set/src/main/java/com/dy/pipIrrParamSet/paramSet/ParamKey.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-param-set/src/main/java/com/dy/pipIrrParamSet/paramSet/ParamKey.java
@@ -31,8 +31,12 @@
     public static final String TcpPort = "tcpPort" ;
     public static final String UpDataMinInterval = "upDataMinInterval" ;
     public static final String WebPort = "webPort" ;
-    public static final String MqttEnable = "mqttEnable" ;
-    public static final String MqttNoSubThenOff = "noSubThenOff" ;
     public static final String ActutorPort = "actutorPort" ;
     public static final String DbName = "dbName" ;
+    public static final String MqttEnable = "mqttEnable" ;
+    public static final String MqttNoSubThenOff = "mqttNoSubThenOff" ;
+    public static final String mqttServerIp = "mqttServerIp" ;
+    public static final String mqttServerPort = "mqttServerPort" ;
+    public static final String mqttProtocolAndDeviceIds = "mqttProtocolAndDeviceIds" ;
+    public static final String mqttSubTopicAndQos = "mqttSubTopicAndQos" ;
 }

--
Gitblit v1.8.0