|
|
@@ -85,7 +85,7 @@ |
|
|
</if> |
|
|
</if> |
|
|
|
|
|
|
|
|
<if test=" null != city and ''!= city "> |
|
|
<if test=" null != city and ''!= city "> |
|
|
and `city` = #{city} |
|
|
|
|
|
|
|
|
and `city` like concat('%', #{city},'%') |
|
|
</if> |
|
|
</if> |
|
|
|
|
|
|
|
|
<if test=" null != merchantName and ''!= merchantName "> |
|
|
<if test=" null != merchantName and ''!= merchantName "> |
|
|
|