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

# Conflicts:
#	order-application-service/src/main/java/cn/freemud/entities/vo/PayGiftWechatCouponInfoVo.java

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

@@ -22,5 +22,7 @@ public class PayGiftWechatCouponInfoVo {
         private String stock_id;
         //发券凭证
         private String out_request_no;
+        // 券code，   如果批次是发放时指定code的类型，则发券时必填
+        private String coupon_code;
     }
 }