yaowang
/
kn-vordm
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

代码冲突解决

This commit is contained in:
glj 2023-04-18 10:11:05 +08:00
parent 16eedaf39c f5427555d8
commit 51136e2658
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DisasterInfoMapper.xml
View File

@ -229,7 +229,7 @@
AND di.respond_status > 1 AND di.respond_status > 1
</if> </if>
<if test="chiefId != null" > <if test="chiefId != null" >
di.chief_id = #{chiefId} and di.chief_id = #{chiefId}
</if> </if>
GROUP BY date GROUP BY date
</select> </select>