Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
0757e67d56
|
|
@ -165,7 +165,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
<if test="glycemicIndex != null "> and cd.glycemic_index = #{glycemicIndex}</if>
|
||||
<if test="sort != null "> and cd.sort = #{sort}</if>
|
||||
<if test="canteenId != null "> and cd.canteen_id = #{canteenId}</if>
|
||||
<if test="stallId != null "> and cd.shopstall_id = #{stallId}</if>
|
||||
<if test="stallId != null "> and (cd.shopstall_id = #{stallId} or cd.shopstall_id is null or cd.shopstall_id == '')</if>
|
||||
<if test="hideFlag != null "> and cd.hide_flag = #{hideFlag}</if>
|
||||
<if test="convertFlag != null "> and cd.convert_flag = #{convertFlag}</if>
|
||||
<if test="materialCost != null "> and cd.material_cost = #{materialCost}</if>
|
||||
|
|
|
|||
Loading…
Reference in New Issue