Merge remote-tracking branch 'origin/master'

孔祥富

2021-03-18 2402f7902663a20fe1b66f4305abb5ba05d7016f

 src/views/dashboard/ygUser.vue

@@ -186,7 +186,6 @@
      this.$get('hr/statistics/empBaseInfoList', {
        ...params
      }).then((r) => {
        debugger
        const data = r.data.data
        that.total = data.total
        that.list = data.rows