Merge remote-tracking branch 'origin/master'

doum

18 小时以前 8fd09daba5c89106b4a9aacd8d5ef9354afc93be

 admin/src/components/business/OperaLabelExpressWindow.vue

@@ -1,6 +1,7 @@
<template>
  <GlobalAlertWindow
    :title="title"
    width="500px"
    :visible.sync="visible"
    :confirm-working="isWorking"
    @confirm="confirm"