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

rk

18 小时以前 609a1931953b2298016bd2b0d6b410666b5ad7b9

 admin/src/components/common/GlobalWindow.vue

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