Merge branch 'master' into yuantest

969f2a4e · yuanyufei · b559ed1b · f2ad1dbf · 969f2a4e
--- a/src/views/system/goodsimport/index.vue
+++ b/src/views/system/goodsimport/index.vue
@@ -81,7 +81,7 @@ export default {
  },
  components: {},
  created() {
-    this.getData();
+
    this.info()
  },
  watch: {},