tradsj

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

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