Merge remote-tracking branch 'origin/master'

cuilei

9 天以前 8b6b7aa7e4f2ae6ec14514875b559aa6890f3b1e

 src/views/dnc/base/modules/DeviceStructure/Permission/AssignPermissionModal.vue

@@ -69,7 +69,7 @@
        dncApi.getAllUsersListApi()
          .then(res => {
            if (res.success) {
              this.allUsersList = res.result.records
              this.allUsersList = res.result
              this.$nextTick(() => this.$refs.userPermissionTransferRef.getHasPermissionUserByApi())
            }
          })