Merge branch 'master' of http://192.168.0.105:10010/r/zhba_enterprises_ys

shuishen

2021-12-04 a71912cb7ecbe4e00a588c9d0e193e70c799d502

 src/views/system/user.vue

@@ -1016,6 +1016,7 @@
    onLoad(page, params = {}) {
      this.loading = true;
      var deptid = this.deptids == null ? this.treeDeptId : this.deptids;
      params['status'] = 1;
      getList(
        page.currentPage,
        page.pageSize,