Merge remote-tracking branch 'origin/master'

CZT

2023-10-24 f27f3ea5055888f7f1c797d0fd7fb26a2013c89c

 igds-web/pom.xml

@@ -144,12 +144,12 @@
        </dependency>


        <!-- 接口包，包括上海接口和、气象接口、三维接口-->
        <!-- 接口包，包括上海接口和、气象接口、三维接口
        <dependency>
            <groupId>com.ld.igds</groupId>
            <artifactId>igds-api-inte</artifactId>
            <version>${igds.version}</version>
        </dependency>
        </dependency>-->


        <!--  私有协议-风正致远
@@ -204,7 +204,7 @@
            </exclusions>
        </dependency>-->

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

        <!--  私有协议-DLT645电表协议-->
        <!--  私有协议-DLT645电表协议
        <dependency>
            <groupId>com.ld.igds</groupId>
            <artifactId>igds-protocol-es</artifactId>
@@ -236,7 +236,7 @@
                    <groupId>log4j</groupId>
                </exclusion>
            </exclusions>
        </dependency>
        </dependency>-->

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

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