tuij

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

@@ -2199,20 +2199,10 @@
         left join RMS_TRUCK_CALCULATE RTC
         on RTC.TRUCK_CALCULATE_ID = TWR.RESULT_GROSS_PLACE_ID
         where RESULT_GROSS_WEIGHT_TIME is not null and
-<<<<<<< HEAD
-        OO.ORDER_TYPE = #{orderType}
-=======
         OO.ORDER_TYPE = #{orderTypee}
-<<<<<<< HEAD
->>>>>>> a082ab0bd9cb789ae91ca4beee53c86183d90b93
-=======
             <if test="userId!=null">
                 and ASO.INSERT_USERNAME=#{userId}
             </if>
-            <if test="usersId!=null">
-                and ASO.UPDATE_USERNAME=#{usersId}
-            </if>
->>>>>>> 7bd59e0cef7eee5baa9af988be3ce17021536453
         )
         <where>
             <if test="purchaseOrderNo != null">