“解决冲突

src/main/java/com/steerinfo/dil/mapper/TmstrainLoadingResultMapper.java

@@ -87,7 +87,6 @@ public interface TmstrainLoadingResultMapper extends IBaseMapper<TmstrainLoading
     //国产矿查询采购订单号
     List<Map<String,Object>> getPurchaseOrderList(Map<String,Object> map);
 
-<<<<<<< HEAD
     //进口矿查询采购订单号
     List<Map<String,Object>> getPurchaseOrderListForImported(Map<String,Object> map);
 
@@ -96,9 +95,9 @@ public interface TmstrainLoadingResultMapper extends IBaseMapper<TmstrainLoading
 
     //进口矿查询分割符
     List<String> findSplitsForImported();
-=======
+
     BigDecimal getPortIdByPortName(String portName);
 
     BigDecimal getGridIdByPortAndBatch(Map<String, Object> map);
->>>>>>> 2215184b6872cb72965fc471b6600442cbc11894
+
 }

src/main/resources/com/steerinfo/dil/mapper/TmstrainLoadingResultMapper.xml

@@ -1390,7 +1390,6 @@
     ORDER BY apo.PURCHASE_ORDER_DATE DESC
     )
   </select>
-<<<<<<< HEAD
 
 <!--  进口矿查询采购订单号-->
   <select id="getPurchaseOrderListForImported" parameterType="java.util.Map" resultType="java.util.Map">
@@ -1451,16 +1450,16 @@
     select SPLIT_WORDS from TMSTRAIN_SPLIT where SPLIT_TYPE='进口矿'
   </select>
 
-=======
+
   <select id="getPortIdByPortName" resultType="java.math.BigDecimal" parameterType="java.lang.String">
     select  RP.PORT_ID "portId"
     from RMS_PORT RP
     WHERE  RP.PORT_NAME = #{portName}
   </select>
+
   <select id="getGridIdByPortAndBatch" resultType="java.math.BigDecimal" parameterType="java.util.Map">
     select WGM.GM_ID "gmId"
     from WMSH_GRID_MATERIAL WGM
    WHERE  WGM.PORT_ID=#{portId} AND WGM.BATCH_ID = #{batchId}
   </select>
->>>>>>> 2215184b6872cb72965fc471b6600442cbc11894
 </mapper>