From 17480b5b82744f4c74b61a2f1e4e5ea780ccc3ff Mon Sep 17 00:00:00 2001
From: zhuguifei <312353457@qq.com>
Date: 星期三, 27 十一月 2024 13:45:25 +0800
Subject: [PATCH] 修复冲突

---
 jeecg-boot-base-core/pom.xml |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/jeecg-boot-base-core/pom.xml b/jeecg-boot-base-core/pom.xml
index 7a3c88b..77acfc8 100644
--- a/jeecg-boot-base-core/pom.xml
+++ b/jeecg-boot-base-core/pom.xml
@@ -252,6 +252,13 @@
 			<groupId>commons-fileupload</groupId>
 			<artifactId>commons-fileupload</artifactId>
 		</dependency>
-	</dependencies>
+    <!--MQTT client -->
+    <dependency>
+      <groupId>org.eclipse.paho</groupId>
+      <artifactId>org.eclipse.paho.client.mqttv3</artifactId>
+      <version>1.2.5</version>
+    </dependency>
 
-</project>
\ No newline at end of file
+  </dependencies>
+
+</project>

--
Gitblit v1.9.3