Merge remote-tracking branch 'origin/master'

孔祥富

2021-02-27 c695c32a2bb103a4d91d0c3e40efe4410ae77759

 src/views/dashboard/ygUser.vue

@@ -5,6 +5,7 @@
    :close-on-click-modal="false"
    :close-on-press-escape="false"
    :visible.sync="isVisible"
    :before-close="beforeClose"
  >
    <div class="app-container">
      <div class="filter-container" style="margin-left: -340px;">
@@ -118,6 +119,9 @@
    }
  },
  methods: {
    beforeClose(done) {
      this.$emit('cancleChooseUser')
    },
    search() {
      this.fetch({
        ...this.queryParams