Merge branch 'dev'

liwei2917
2 parents 93db4c46 aa0693ff
Showing 1 changed file with 1 additions and 1 deletions
src/main/java/com/cnlive/shenhe/serviceImpl/LiveServiceImpl.java
@@ -236,7 +236,7 @@ public class LiveServiceImpl {
         	} catch (ParseException e) {
         		e.printStackTrace();
         	}
-        	criteria.andLessThanOrEqualTo("activity_end_time", enddate);
+        	criteria.andLessThanOrEqualTo("activity_start_time", enddate);
         }
         if (CommonUtils.isNotEmpty(activity_name)) {
             criteria.andLike("activity_name", "%" + activity_name + "%");