Merge remote-tracking branch 'origin/master'

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/app/dto/AppOrderInfoDTO.java

@@ -144,4 +144,6 @@ public class AppOrderInfoDTO implements Serializable {
     //提前预约时间：0免预约 单位：时
     @Schema(description = "提前预约时间：0免预约 单位：时")
     private Integer advanceTime;
+    @Schema(description = "参赛资质")
+    private String gameCertification;
 }

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/app/service/impl/OrderServiceImpl.java

@@ -865,6 +865,7 @@ public class OrderServiceImpl implements IOrderService {
         appOrderInfoDTO.setPhoneNumber(appOrder.getUserPhone());
         appOrderInfoDTO.setTotalPrice(appOrder.getOriginalPrice());
         appOrderInfoDTO.setPrice(appOrder.getPrice());
+        appOrderInfoDTO.setGameCertification(appOrder.getGameCertification());
         if (appOrder.getType().equals(CommonConstant.ORDER_TYPE_2)) {
             appOrderInfoDTO.setSDiscounts(appOrder.getSDiscounts());
             appOrderInfoDTO.setTDiscounts(appOrder.getTDiscounts());