Merge branch 'KA-20210622-ID1032306总部和区域活动可同时生效-周晓航' into qa

order-application-service/src/main/java/cn/freemud/entities/vo/PayGiftCouponVo.java

@@ -9,6 +9,11 @@ public class PayGiftCouponVo {
      * 优惠券类型 0-商品券 1-代金券 3-折扣券 4-换购券 5-配送券
      */
     private Integer couponType;
+
+    /**
+     * 活动ID
+     */
+    private  String activityId;
     /**
      * 活动code v1.5.4新增
      */

order-application-service/src/main/java/cn/freemud/service/job/DemoDataMsg.java

@@ -86,6 +86,7 @@ public class DemoDataMsg {
         List<PayGiftCouponVo>  demo111  =new ArrayList<>();
         for (int i = 0; i < 2; i++) {
             PayGiftCouponVo vo = new PayGiftCouponVo();
+            vo.setActivityId(i+"");
             vo.setCouponType(i);
             vo.setActivityCode(i+"");
             vo.setCouponCode(i+"");