Commit e354792c authored by hanfeng's avatar hanfeng

Merge remote-tracking branch 'origin/master'

parents de35822c a7319b59
...@@ -871,7 +871,7 @@ ...@@ -871,7 +871,7 @@
bc.id = #{parkBranchCompanyId} bc.id = #{parkBranchCompanyId}
</otherwise> </otherwise>
</choose> </choose>
where vm.isdel = 0 and vm.status = 0) where vm.isdel = 0 and vm.status = 0 and vm.app_show = 1)
</if> </if>
<if test="lon != null and lat != null"> <if test="lon != null and lat != null">
order by order by
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment