wulin/wl_management
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

解决冲突

Browse Source
This commit is contained in:
wulin 2020-12-09 16:56:53 +08:00
parent f7a89b666f
commit e024de37e4
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/resources/mapper/performance/ResultTaskMapper.xml
View File

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