提交merge1.3

2025-12-27 15:30:48 +08:00
parent 3c497417dc
commit cbd3e7f981
6 changed files with 4 additions and 39 deletions
--- a/openhis-server-new/openhis-application/pom.xml
+++ b/openhis-server-new/openhis-application/pom.xml
@@ -66,17 +66,10 @@
            <artifactId>httpclient</artifactId>
        </dependency>
        <!-- rabbitMQ -->
-<<<<<<< HEAD
        <!-- <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-amqp</artifactId>
        </dependency> -->
-=======
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-amqp</artifactId>
-        </dependency>
->>>>>>> v1.3

    </dependencies>