Commit af78763c by jinxin

Merge remote-tracking branch 'origin/developer' into developer

parents 77577f1b 23931aa1
...@@ -330,7 +330,7 @@ ...@@ -330,7 +330,7 @@
and a.active_status = 0 and a.active_status = 0
</if> </if>
<if test="permitState==1"> <if test="permitState==1">
and a.active_status = 1 and a.expire_time > now() and a.active_status = 1 and a.expire_time > now() and a.expire_time > DATE_ADD(DATE_FORMAT(NOW(),'%Y-%m-%d'),INTERVAL 30 DAY)
</if> </if>
<if test="permitState==2"> <if test="permitState==2">
......
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