From 08000305684ec0c758090fbb5cbd85132218fcef Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期五, 27 十月 2023 16:30:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 igds-web/pom.xml |   23 +++++++++++------------
 1 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/igds-web/pom.xml b/igds-web/pom.xml
index 82287d2..4c92a4d 100644
--- a/igds-web/pom.xml
+++ b/igds-web/pom.xml
@@ -10,7 +10,6 @@
         <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>
@@ -145,15 +144,15 @@
         </dependency>
 
 
-        <!-- 鎺ュ彛鍖咃紝鍖呮嫭涓婃捣鎺ュ彛鍜屻�佹皵璞℃帴鍙ｃ�佷笁缁存帴鍙�-->
+        <!-- 鎺ュ彛鍖咃紝鍖呮嫭涓婃捣鎺ュ彛鍜屻�佹皵璞℃帴鍙ｃ�佷笁缁存帴鍙�
         <dependency>
             <groupId>com.ld.igds</groupId>
             <artifactId>igds-api-inte</artifactId>
             <version>${igds.version}</version>
-        </dependency>
+        </dependency>-->
 
 
-        <!--  绉佹湁鍗忚-椋庢鑷磋繙-->
+        <!--  绉佹湁鍗忚-椋庢鑷磋繙
         <dependency>
             <groupId>com.ld.igds</groupId>
             <artifactId>igds-protocol-fzzy3</artifactId>
@@ -168,7 +167,7 @@
                     <groupId>log4j</groupId>
                 </exclusion>
             </exclusions>
-        </dependency>
+        </dependency>-->
 
         <!-- MODBUS-TCP
         <dependency>
@@ -188,7 +187,7 @@
         </dependency>-->
 
 
-        <!-- 绉佹湁鍗忚-椋庢鑷磋繙IOT銆佸埗姘満-->
+        <!-- 绉佹湁鍗忚-椋庢鑷磋繙IOT銆佸埗姘満
         <dependency>
             <groupId>com.ld.igds</groupId>
             <artifactId>igds-protocol-iot</artifactId>
@@ -203,7 +202,7 @@
                     <groupId>log4j</groupId>
                 </exclusion>
             </exclusions>
-        </dependency>
+        </dependency>-->
 
         <!--  绉佹湁鍗忚-璐濆崥绮儏
         <dependency>
@@ -239,7 +238,7 @@
             </exclusions>
         </dependency>-->
 
-        <!--  绉佹湁鍗忚-閭︽捣鏅鸿兘
+        <!--  绉佹湁鍗忚-閭︽捣鏅鸿兘-->
         <dependency>
             <groupId>com.ld.igds</groupId>
             <artifactId>igds-protocol-bhzn</artifactId>
@@ -254,7 +253,7 @@
                     <groupId>log4j</groupId>
                 </exclusion>
             </exclusions>
-        </dependency>-->
+        </dependency>
 
         <!--  绉佹湁鍗忚-姝ｆ潵鐢靛瓙
         <dependency>
@@ -271,9 +270,9 @@
                     <groupId>log4j</groupId>
                 </exclusion>
             </exclusions>
-        </dependency> -->
+        </dependency>-->
 
-        <!--  娴峰悍杞︾墝璇嗗埆-SDK
+        <!--  娴峰悍杞︾墝璇嗗埆-SDK-->
         <dependency>
             <groupId>com.ld.igds</groupId>
             <artifactId>igds-protocol-sdk</artifactId>
@@ -288,7 +287,7 @@
                     <groupId>log4j</groupId>
                 </exclusion>
             </exclusions>
-        </dependency>-->
+        </dependency>
     </dependencies>
 
     <dependencyManagement>

--
Gitblit v1.9.3