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

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

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

@@ -640,4 +640,8 @@ public class QueryOrderResponseVo {
      */
     private boolean orderCompareAfterSaleOrder;
 
+    /**
+     * 【订单聚合层】总部和区域活动可同时生效 直接反馈促销给的活动数据
+     */
+    private List<PayGiftCheckAndJoinResponseDtoNew> newPayGift;
 }