handle merge

姜枫
Commit 25d29b4bb30d4a0bc312d666fe82f7d131c69fe8 1 parent 7cae2742
Showing 2 changed files with 2 additions and 2 deletions
apps/me/models/returns.js
public/js/common/bind-polyfill.js
--- a/apps/me/models/returns.js
View file @25d29b4
+++ b/apps/me/models/returns.js
View file @25d29b4
@@ -630,7 +630,7 @@ const _setExchangeDetailData = (data) => {
             }
             break;
-     case 20:
+        case 20:
             if (data.deliveryTpyeName === '寄回换货') {
                 Object.assign(list, {
--- a/public/js/common/bind-polyfill.js
View file @25d29b4
+++ b/public/js/common/bind-polyfill.js
View file @25d29b4
@@ -27,4 +27,4 @@ if (!Function.prototype.bind) {
         return fBound;
     };
-}
+}