记得上下班打卡 | git大法好,push需谨慎

Commit 64943a94 authored by 胡佳晨's avatar 胡佳晨

Merge branch 'hjc_road_coupon' into dev_rc_xuper_op

parents e527c998 3cc73c93
......@@ -752,7 +752,7 @@ public class KylinPerformancesServiceImpl implements IKylinPerformancesService {
if (roadShowIds.size() == 0 || roadShowIds.contains(roadShowId)) {
KylinCandyVo vo = KylinCandyVo.getNew();
vo.setCouponId(item.getCouponId());
vo.setCouponId(item.getUcouponId());
vo.setUcouponId(item.getUcouponId());
vo.setRoadShowId(roadShowIds.contains(roadShowId) ? roadShowId : "");
voList.add(vo);
}
......
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