Merge remote-tracking branch 'origin/master'

fuliqi

2024-08-16 d8a62fdbbd0ecc4cb4ab41fc83ec81bc7e4c4bdc

 pom.xml

@@ -126,6 +126,18 @@
    </dependencyManagement>

    <dependencies>
        <!-- sip协议栈 -->
        <dependency>
            <groupId>javax.sip</groupId>
            <artifactId>jain-sip-ri</artifactId>
            <version>1.3.0-91</version>
        </dependency>
        <!-- 海康client -->
        <dependency>
            <groupId>com.hikvision.ga</groupId>
            <artifactId>artemis-http-client</artifactId>
            <version>1.1.3</version>
        </dependency>
        <!-- jpa -->
        <dependency>
            <groupId>org.springframework.boot</groupId>
@@ -256,7 +268,7 @@
        <dependency>
            <groupId>org.springframework.cloud</groupId>
            <artifactId>spring-cloud-starter-openfeign</artifactId>
            <version>4.1.3</version>
            <version>4.0.4</version>
        </dependency>