Merge branch 'release/4.8' of git.yoho.cn:fe/YOHOBUYPC into release/4.8

@@ -531,10 +531,7 @@ class CartData
         $param['orderCode'] = $orderCode;
         $param['orderCode'] = $orderCode;
         $param['payment'] = $payment;
         $param['payment'] = $payment;
         $param['client_secret'] = Sign::getSign($param);
         $param['client_secret'] = Sign::getSign($param);
-<<<<<<< HEAD
-        return Yohobuy::get(Yohobuy::API_URL, $param);
-=======
+
         return Yohobuy::get(API_URL, $param);
         return Yohobuy::get(API_URL, $param);
->>>>>>> master
     }
     }
 }
 }