Merge remote-tracking branch 'origin/master'

YYC

2023-09-16 d62cbd8da3bd2422de2923a6e7d999822730d632

 igds-web/pom.xml

@@ -170,7 +170,7 @@
            </exclusions>
        </dependency>

        <!-- MODBUS-TCP -->
        <!-- MODBUS-TCP
        <dependency>
            <groupId>com.ld.igds</groupId>
            <artifactId>igds-protocol-modbus</artifactId>
@@ -185,10 +185,10 @@
                    <groupId>log4j</groupId>
                </exclusion>
            </exclusions>
        </dependency>
        </dependency>-->


        <!-- 私有协议-风正致远IOT、制氮机
        <!-- 私有协议-风正致远IOT、制氮机-->
        <dependency>
            <groupId>com.ld.igds</groupId>
            <artifactId>igds-protocol-iot</artifactId>
@@ -203,7 +203,7 @@
                    <groupId>log4j</groupId>
                </exclusion>
            </exclusions>
        </dependency>-->
        </dependency>

        <!--  私有协议-贝博粮情
        <dependency>
@@ -222,7 +222,7 @@
            </exclusions>
        </dependency>-->

        <!--  私有协议-邦海智能-->
        <!--  私有协议-邦海智能
        <dependency>
            <groupId>com.ld.igds</groupId>
            <artifactId>igds-protocol-bhzn</artifactId>
@@ -237,7 +237,7 @@
                    <groupId>log4j</groupId>
                </exclusion>
            </exclusions>
        </dependency>
        </dependency>-->

        <!--  私有协议-正来电子
        <dependency>