merge

src/main/java/com/steerinfo/dil/mapper/UniversalMapper.java

@@ -293,8 +293,5 @@ public interface UniversalMapper {
 
     int updateRemark(Map<String, Object> map);
 
-<<<<<<< HEAD
     int updateRemarkPic(Map<String, Object> map);
-=======
->>>>>>> 5899cccac071830d80498674539e672a6f86a38b
 }

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

@@ -1614,13 +1614,9 @@
         SET REMARK = #{remark}
         WHERE ORDER_ID = #{orderId}
     </update>
-<<<<<<< HEAD
     <update id="updateRemarkPic">
         UPDATE OMSTRUCK_ORDER
         SET URL = #{urls}
         WHERE ORDER_ID = #{orderId}
     </update>
-=======
-
->>>>>>> 5899cccac071830d80498674539e672a6f86a38b
 </mapper>