提交merge1.3

2025-12-27 15:30:25 +08:00
parent 8c607c8749
commit 088861f66e
1245 changed files with 220442 additions and 77616 deletions
--- a/openhis-server-new/openhis-common/pom.xml
+++ b/openhis-server-new/openhis-common/pom.xml
@@ -30,12 +30,18 @@
        <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>