Merge branch 'pre' into dev

open-api/src/main/java/com/api/controller/v1/NotifyController.java

@@ -89,6 +89,7 @@ public class NotifyController {
                 responseQueryTradeModel.setMerchantNo(tradeOrder.getMerNo());
                 responseQueryTradeModel.setOutTradeNo(tradeOrder.getOutTradeNo());
                 responseQueryTradeModel.setAccTradeNo(tradeOrder.getAccTradeNo());
+                responseQueryTradeModel.setPlatformTradeNo(tradeOrder.getPlatformTradeNo());
                 responseQueryTradeModel.setUserId(tradeOrder.getPayUserId());
                 responseQueryTradeModel.setPayMode(tradeOrder.getPayMode());
                 responseQueryTradeModel.setTradeAmount(tradeOrder.getTradeAmount());

open-api/src/main/java/com/api/controller/v1/TradeController.java

@@ -152,6 +152,7 @@ public class TradeController {
             responseQueryTradeModel.setMerchantNo(tradeOrder.getMerNo());
             responseQueryTradeModel.setOutTradeNo(tradeOrder.getOutTradeNo());
             responseQueryTradeModel.setAccTradeNo(tradeOrder.getAccTradeNo());
+            responseQueryTradeModel.setPlatformTradeNo(tradeOrder.getPlatformTradeNo());
             responseQueryTradeModel.setUserId(tradeOrder.getPayUserId());
             responseQueryTradeModel.setPayMode(tradeOrder.getPayMode());
             responseQueryTradeModel.setTradeAmount(tradeOrder.getTradeAmount());