提交merge1.3

openhis-server-new/openhis-domain/pom.xml

@@ -30,14 +30,6 @@
 
     <dependencies>
 
-<<<<<<< HEAD
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-        </dependency>
-
-=======
->>>>>>> v1.3
         <dependency>
             <groupId>com.alibaba</groupId>
             <artifactId>fastjson</artifactId>
@@ -54,15 +46,6 @@
             <artifactId>openhis-common</artifactId>
             <version>0.0.1-SNAPSHOT</version>
         </dependency>
-<<<<<<< HEAD
-        <!-- 核心共通模块 -->
-        <dependency>
-            <groupId>com.core</groupId>
-            <artifactId>core-common</artifactId>
-        </dependency>
-
-=======
->>>>>>> v1.3
         <dependency>
             <groupId>com.opencsv</groupId>
             <artifactId>opencsv</artifactId>