Home Explore Help
Sign In
DAL-DAZHOU2
/
DAI_DAZHOU-OMS
5
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

tradsj

luobang 3 years ago
parent
53d09aa315
commit
c86a3d4f66
1 changed files with 0 additions and 4 deletions
Unified View Show Diff Stats
  1. 0 4
      src/main/resources/com/steerinfo/dil/mapper/OmstruckOrderMapper.xml

+ 0 - 4
src/main/resources/com/steerinfo/dil/mapper/OmstruckOrderMapper.xml
View File 

@@ -221,11 +221,7 @@
 
             </if>
 
             </if>
 
         </where>
 
         </where>
 
     </sql>
 
     </sql>
 
-<<<<<<< HEAD
 
-    <delete id="deleteByPrimaryKey" parameterType="decimal">
 
-=======
 
     <delete id="deleteByPrimaryKey" parameterType="DECIMAL">
 
     <delete id="deleteByPrimaryKey" parameterType="DECIMAL">
 
->>>>>>> 5804cade49a708b938a0d46ae1d3d076d2c02aac
 
         delete from OMSTRUCK_ORDER
 
         delete from OMSTRUCK_ORDER
 
         where ORDER_ID = #{orderId,jdbcType=DECIMAL}
 
         where ORDER_ID = #{orderId,jdbcType=DECIMAL}
 
     </delete>
 
     </delete>