Merge branch 'payannotation' into 'master'

feat:组合支付方式参数注释

See merge request !13

src/views/pay/index.vue

@@ -253,7 +253,7 @@ export default {
     async queryPayInfo() {
       const [data, error] = await queryPayInfo({
         orderNo: this.orderNo,
-        isUsedMergePayMethod: cookies.get('source') !== 'tob'
+        isUsedMergePayMethod: cookies.get('source') !== 'tob' // 是否需要组合支付，true需要。false不需要
       });
       if (error && codeArr.indexOf(error?.response?.businessCode) < 0) {
         this.payResult('Fail');