Merge branch 'colexiu-payment' into jenkins

src/views/adapay/payment/index.tsx

@@ -155,7 +155,7 @@ export default defineComponent({
           // orderNo: props.paymentConfig.orderNo,
           merOrderNo: props.paymentConfig.orderNo,
           paymentChannel: payChannel,
-          paymentType
+          paymentVendor: paymentType
         }
         const res = await request.post(
           urlFix + '/userOrder/executePayment/v2',