From 125514d414a72f139155613076b397d0468a605f Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期二, 12 九月 2023 18:43:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
igds-web/pom.xml | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/igds-web/pom.xml b/igds-web/pom.xml
index fff77dc..cf599df 100644
--- a/igds-web/pom.xml
+++ b/igds-web/pom.xml
@@ -10,6 +10,7 @@
<groupId>com.ld.igds</groupId>
<artifactId>igds-parent-pom</artifactId>
<version>4.0.0-RELEASE</version>
+ <relativePath>../igds-parent-pom/pom.xml</relativePath>
</parent>
<dependencies>
@@ -169,7 +170,7 @@
</exclusions>
</dependency>
- <!-- MODBUS-TCP -->
+ <!-- MODBUS-TCP
<dependency>
<groupId>com.ld.igds</groupId>
<artifactId>igds-protocol-modbus</artifactId>
@@ -185,7 +186,7 @@
</exclusion>
</exclusions>
</dependency>
-
+-->
<!-- 绉佹湁鍗忚-椋庢鑷磋繙IOT銆佸埗姘満
<dependency>
@@ -221,7 +222,7 @@
</exclusions>
</dependency>-->
- <!-- 绉佹湁鍗忚-閭︽捣鏅鸿兘-->
+ <!-- 绉佹湁鍗忚-閭︽捣鏅鸿兘
<dependency>
<groupId>com.ld.igds</groupId>
<artifactId>igds-protocol-bhzn</artifactId>
@@ -237,7 +238,7 @@
</exclusion>
</exclusions>
</dependency>
-
+-->
<!-- 绉佹湁鍗忚-姝ｆ潵鐢靛瓙
<dependency>
<groupId>com.ld.igds</groupId>
@@ -319,6 +320,7 @@
<configuration>
<fork>true</fork>
</configuration>
+
</plugin>
<!-- YUI Compressor Maven鍘嬬缉鎻掍欢 寮�鍙戝寘涓嶅疄鐢�-->
--
Gitblit v1.9.3