Merge branch 'develop/v1.0' into master-test

pdf-office-payment/src/main/java/cn/kdan/cloud/pdf/office/payment/service/impl/OrderServiceImpl.java

@@ -485,7 +485,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
                 Map<String, String> result = new HashMap<>();
                 result.put("payHref", payHref);
                 result.put("orderId", order.getId());
-                result.put("thirdOrderNo", order.getThirdOrderNo());
+                result.put("thirdOrderNo", order.getThirdTradeNo());
                 return result;
             }
         } catch (IOException e) {