Commit 19a53d14 authored by hanfeng's avatar hanfeng

Merge branch 'master_activity-hf' into base-modify

parents 08b1fcd5 5a497965
...@@ -25,6 +25,7 @@ ...@@ -25,6 +25,7 @@
</if> </if>
<if test="type ==2"> <if test="type ==2">
and is_publish=1 and is_publish=1
and is_show=1
</if> </if>
order by rank asc , start_time desc order by rank asc , start_time desc
</select> </select>
......
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