浏览代码

Merge branch 'master' into test

anderx 4 年之前
父节点
当前提交
61b0113dd8
共有 1 个文件被更改,包括 1 次插入1 次删除
  1. 1 1
      src/main/java/com/goafanti/common/mapper/UserLockReleaseMapper.xml

+ 1 - 1
src/main/java/com/goafanti/common/mapper/UserLockReleaseMapper.xml

@@ -388,7 +388,7 @@
 	left join user u on t0.uid=u.id
 	where u.channel=0
 	<if test="type==0">
-	 and datediff(now(),if(t0.lock_time &lt; t1.last_follow_time,t1.last_follow_time,t1.t0.lock_time))>30
+	 and datediff(now(),if(t0.lock_time &lt; t1.last_follow_time,t1.last_follow_time,t0.lock_time))>30
 	</if>
 	<if test="type==1">
 	 and datediff(now(),t0.lock_time)>270