Resolve merge conflicts in pom.xml files

master
86191 2024-08-03 17:56:57 +08:00
commit bee2544d68
2 changed files with 1 additions and 3 deletions

View File

@ -23,7 +23,6 @@
<groupId>com.muyu</groupId> <groupId>com.muyu</groupId>
<artifactId>cloud-common-core</artifactId> <artifactId>cloud-common-core</artifactId>
</dependency> </dependency>
</dependencies> </dependencies>
</project> </project>

View File

@ -85,13 +85,12 @@
<artifactId>cloud-common-rabbit</artifactId> <artifactId>cloud-common-rabbit</artifactId>
</dependency> </dependency>
<!--支付公共依赖--> <!--支付公共依赖-->
<dependency> <dependency>
<groupId>com.muyu</groupId> <groupId>com.muyu</groupId>
<artifactId>cloud-pay-common</artifactId> <artifactId>cloud-pay-common</artifactId>
</dependency> </dependency>
</dependencies> </dependencies>
<build> <build>