From e024de37e4679c0af5eba1164904ae5513c03e60 Mon Sep 17 00:00:00 2001
From: wulin <wulin@linzikg.com>
Date: Wed, 9 Dec 2020 16:56:53 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/mapper/performance/ResultTaskMapper.xml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/main/resources/mapper/performance/ResultTaskMapper.xml b/src/main/resources/mapper/performance/ResultTaskMapper.xml
index 986fccb9..d542f868 100644
--- a/src/main/resources/mapper/performance/ResultTaskMapper.xml
+++ b/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>