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

# Conflicts:
#	order-application-service/src/main/java/cn/freemud/entities/dto/activity/PayGiftCheckAndJoinResponseDtoNew.java
#	order-application-service/src/main/java/cn/freemud/entities/dto/activity/PayGiftCheckAndJoinResponseObj.java

order-application-service/src/main/java/cn/freemud/entities/dto/activity/PayGiftCheckAndJoinResponseDtoNew.java

+package cn.freemud.entities.dto.activity;
+
+import cn.freemud.entities.vo.PayGiftCouponVo;
+import cn.freemud.entities.vo.PayGiftWechatCouponInfoVo;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author : xh.Z
+ * @email : fisherman0510@163.com
+ * @Date : 2021/6/23 下午9:22
+ * @description :
+ */
+@Data
+public class PayGiftCheckAndJoinResponseDtoNew {
+    /**
+     * 发送方式
+     *  0-静默发送
+     * 5-手动发送
+     */
+    private  Integer sendType;
+
+
+    /**
+     * 活动类型 支付有礼-6
+     */
+    private  String type;
+
+
+    /**
+     * 奖励类型：0-非码券，2-微信商家券，3-弹窗奖励
+     */
+    private String syncWechat;
+
+    /**
+     * 微信发券插件对象
+     */
+    private PayGiftWechatCouponInfoVo wechatCouponInfo;
+
+    /**
+     * 券列表
+     */
+    private List<PayGiftCouponVo> coupons;
+
+    /**
+     *活动及弹窗奖励的集合
+     */
+    private List<ActivitysDtoNew> activitys;
+}

order-application-service/src/main/java/cn/freemud/entities/dto/activity/PayGiftCheckAndJoinResponseObj.java

+package cn.freemud.entities.dto.activity;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author : xh.Z
+ * @email : fisherman0510@163.com
+ * @Date : 2021/6/24 上午11:20
+ * @description :
+ */
+@Data
+public class PayGiftCheckAndJoinResponseObj {
+
+    private PayGiftCheckAndJoinResponseDto oldPayGift;
+
+    private List<PayGiftCheckAndJoinResponseDtoNew> newPayGift;
+}