Merge remote-tracking branch 'origin/master'

doum

20 小时以前 d0da0ce546110de49cca9e0358029a51c53188d6

 admin/src/components/common/GlobalAlertWindow.vue

@@ -6,6 +6,7 @@
    :with-header="true"
    :width="width"
    :close-on-press-escape="false"
    :close-on-click-modal="false"
    :wrapper-closable="false"
    :append-to-body="true"
    @close="close"