merge 冲突

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

@@ -830,7 +830,6 @@ public class PayServiceImpl {
         if (null != orderPayItemList && orderPayItemList.size() > 0) {
             Integer partnerId = Integer.valueOf(orderBean.getCompanyId());
             MultiQueryRequest request = new MultiQueryRequest();
-            request.setEnable_platform_data_query(false);
             request.setPartnerId(partnerId);
             request.setStoreId(orderBean.getShopId());
             request.setOutOrderNo(orderBean.getOid());