Merge remote-tracking branch 'origin/master'

jiazx0107@163.com

2023-11-04 43ce77a85d8297a53dc25430fff10ead57296167

 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>
@@ -188,7 +187,7 @@
        </dependency>-->


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

        <!--  私有协议-贝博粮情
        <!--  私有协议-贝博粮情-->
        <dependency>
            <groupId>com.ld.igds</groupId>
            <artifactId>igds-protocol-beibo</artifactId>
@@ -220,7 +219,24 @@
                    <groupId>log4j</groupId>
                </exclusion>
            </exclusions>
        </dependency>-->
        </dependency>

        <!--  私有协议-DLT645电表协议-->
        <dependency>
            <groupId>com.ld.igds</groupId>
            <artifactId>igds-protocol-es</artifactId>
            <version>${igds.version}</version>
            <exclusions>
                <exclusion>
                    <artifactId>slf4j-log4j12</artifactId>
                    <groupId>org.slf4j</groupId>
                </exclusion>
                <exclusion>
                    <artifactId>log4j</artifactId>
                    <groupId>log4j</groupId>
                </exclusion>
            </exclusions>
        </dependency>

        <!--  私有协议-邦海智能
        <dependency>
@@ -254,7 +270,7 @@
                    <groupId>log4j</groupId>
                </exclusion>
            </exclusions>
        </dependency> -->
        </dependency>-->

        <!--  海康车牌识别-SDK
        <dependency>