Merge remote-tracking branch 'origin/3.0.1' into 3.0.1

rk

8 天以前 3d46f89ff6c600f60d97f4541443540be20460c1

 admin/src/components/common/GlobalWindow.vue

@@ -62,6 +62,7 @@
    },
    close () {
      this.$emit('update:visible', false)
      this.$emit('close')
    }
  }
}