合并冲突

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

@@ -512,7 +512,7 @@
         </if>
         order by "consigneeCompanyName"
     </select>
-<<<<<<< HEAD
+
     <select id="queryAllSupplierByLike" resultType="java.util.Map">
         select *
         from (
@@ -527,7 +527,5 @@
             </if>
         </where>
     </select>
-=======
 
->>>>>>> e7d114c738959299baef4ab05738fdac218aa6c7
 </mapper>