解决合并冲突

2025-12-10 14:20:24 +08:00
parent e1385cb3e6
commit 18f6a845e6
804 changed files with 61881 additions and 13577 deletions
--- a/openhis-server-new/openhis-common/pom.xml
+++ b/openhis-server-new/openhis-common/pom.xml
@@ -25,7 +25,8 @@
        <dependency>
            <groupId>com.core</groupId>
            <artifactId>core-admin</artifactId>
-        </dependency>
+            <version>0.0.1-SNAPSHOT</version>
+        </dependency>       

    </dependencies>