Resolve merge conflicts in pom.xml files

2024-08-03 17:56:57 +08:00 · 2024-08-03 17:56:57 +08:00 · bee2544d68
parent 13b55cc5d6 3b72a2aba2
commit bee2544d68
2 changed files with 1 additions and 3 deletions
--- a/cloud-pay-common/pom.xml
+++ b/cloud-pay-common/pom.xml
@ -23,7 +23,6 @@
            <groupId>com.muyu</groupId>
            <artifactId>cloud-common-core</artifactId>
        </dependency>
-
    </dependencies>

 </project>
--- a/cloud-pay-server/pom.xml
+++ b/cloud-pay-server/pom.xml
@ -85,13 +85,12 @@
            <artifactId>cloud-common-rabbit</artifactId>
        </dependency>

+
        <!--支付公共依赖-->
        <dependency>
            <groupId>com.muyu</groupId>
            <artifactId>cloud-pay-common</artifactId>
        </dependency>
-
-
    </dependencies>

    <build>