解决冲突

src/main/resources/mapper/performance/ResultTaskMapper.xml

@@ -88,15 +88,12 @@
         select * from lz_result_task  where detail_id=#{detailId} and is_delete = 0 order by order_by asc
     </select>
 
-<<<<<<< HEAD
     <update id="deleteResultTasksByDetailId" parameterType="java.lang.Long">
         update lz_result_task set is_delete = 1 where detail_id=#{detailId} limit 1
     </update>
 
-=======
     <select id="selectResultTaskDtosByDetailId" resultType="com.lz.modules.performance.dto.ResultTaskDto" >
         select name,process_rate from lz_result_task  where detail_id=#{detailId} and is_delete = 0 order by order_by asc
     </select>
->>>>>>> a686b4951729942fab37f1855cca21161b19793a
 </mapper>