handle merge

@@ -158,7 +158,7 @@ const updateOrderPayBank = (code, payment, bankCode) => {
 const savePrePayInfo = (code, payment, uid) => {
     return co(function *() {
         let data = yield api.savePrePayInfo(code, payment, uid);
-        
+
         return data;
     })();
 };