Merge branch 'master_activity' into dev

xx-summit/xx-summit-server/src/main/resources/mapper/ActivityMapper.xml

@@ -12,7 +12,7 @@
             and title like CONCAT('%',#{title},'%')
         </if>
         <if test="startTime != null">
-            and from_unixtime(start_time,'%Y-%m-%e %H')=from_unixtime(unix_timestamp(), '%Y-%m-%e %H')
+            and from_unixtime(start_time/1000,'%Y-%m-%e %H')=from_unixtime(unix_timestamp(), '%Y-%m-%e %H')
         </if>
         <if test="status != null and status == 1">
             and (status=#{status} or (status=0 and  (start_time/1000) &gt;= unix_timestamp())  )