Merge remote-tracking branch 'origin/master'

Pu Zhibing

2 天以前 f6f4e7beea525f0c450d618fdc93f112c6813edc

 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/OrderUtil.java

@@ -586,7 +586,7 @@
    * @return
    */
   public static GetPaymentInfo paymentInfo(GetPaymentInfoDataRequest getPaymentInfoDataRequest) {
      getPaymentInfoDataRequest.setPartnerId("5400004");
      getPaymentInfoDataRequest.setPartnerId("prod".equals(qianYunTongConfig.getActiveProfile()) ? "5401007" : "5400004");
      
      GetPaymentInfoRequest request = new GetPaymentInfoRequest();
      request.setRequstType("POST");