提交merge1.3

2025-12-27 15:30:40 +08:00
parent 088861f66e
commit 3c497417dc
167 changed files with 0 additions and 17577 deletions
--- a/openhis-server-new/openhis-common/pom.xml
+++ b/openhis-server-new/openhis-common/pom.xml
@@ -30,18 +30,12 @@
        <dependency>
            <groupId>com.core</groupId>
            <artifactId>core-admin</artifactId>
-<<<<<<< HEAD
        </dependency>       
        <dependency>
            <groupId>com.core</groupId>
            <artifactId>core-common</artifactId>
            <scope>compile</scope>
        </dependency>
-=======
-            <version>0.0.1-SNAPSHOT</version>
-        </dependency>       
-
->>>>>>> v1.3
    </dependencies>

 </project>