解决冲突

order-application-service/src/main/java/cn/freemud/service/impl/PayServiceImpl.java

@@ -835,7 +835,7 @@ public class PayServiceImpl {
             request.setStoreId(orderBean.getShopId());
             request.setOutOrderNo(orderBean.getOid());
             //查询聚合支付结果
-            MultiQueryRespDto<MultiQueryRespDto.Data> response = comPayClient.paymentApplicationQuery(request, partnerId);
+            MultiQueryRespDto response = comPayClient.paymentApplicationQuery(request, partnerId);
             if (response != null && response.getData() != null && Objects.equals(response.getCode(), MULITI_RESPONSE)) {
                 List<MultiPaymentRespDto> multiPaymentRespDtoArrayList = response.getData().getQueryList();
                 if (null != multiPaymentRespDtoArrayList && multiPaymentRespDtoArrayList.size() > 0) {