Merge branch 'hz_master' into dev

xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/biz/ActivityRuleBiz.java

@@ -70,7 +70,7 @@ public class ActivityRuleBiz extends BaseBiz<ActivityRuleMapper,ActivityRule> {
                                     int days=coupon.getValidDays()==null?0:coupon.getValidDays();
                                     coupon.setValidEndTime(System.currentTimeMillis()+days*24*60*60*1000);
                                 }
-                                coupons.add(couponBiz.selectById(id));
+                                coupons.add(coupon);
                             }
                         }
                     }