Home Explore Help
Sign In
DAL-DAZHOU
/
DAL-DAZHOU-API
2
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

合并冲突

txf 3 years ago
parent
00e63919bc
commit
d164e259c4
1 changed files with 1 additions and 3 deletions
Unified View Show Diff Stats
  1. 1 3
      src/main/resources/com/steerinfo/dil/mapper/UniversalMapper.xml

+ 1 - 3
src/main/resources/com/steerinfo/dil/mapper/UniversalMapper.xml
View File 

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