Merge branch 'feature/12月迭代' into dev

src/views/recharge/components/set-rule-dialog.vue

@@ -158,6 +158,7 @@ export default {
     },
     extend(to, from) {
       for (let key in to) {
+        if (!from.hasOwnProperty(key)) continue;
         to[key] = from[key];
       }
     },