修改冲突

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

@@ -68,12 +68,10 @@ public interface UniversalMapper {
     // 模糊查询收货单位
     List<Map<String, Object>> getConsigneeListByLike(Map<String, Object> mapValue);
 
-<<<<<<< HEAD
     //模糊查询所有发货单位
     List<Map<String, Object>> queryAllSupplierByLike(Map<String, Object> mapValue);
-=======
+
     // 通过ssoId查询承运商id
     BigDecimal getCarrierIdBySSO(String carrierSsoId);
 
->>>>>>> e7d114c738959299baef4ab05738fdac218aa6c7
 }