代码冲突解决
This commit is contained in:
commit
51136e2658
|
@ -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>
|
||||||
|
|
Loading…
Reference in New Issue