Merge remote-tracking branch 'origin/master' into master

lyfO_o

2022-05-11 63747f027dae973326970afeef696a382b45affd

 src/views/systemManage/userManage/index.vue

@@ -200,7 +200,7 @@
                        <span>{{ scope.row.roles | parseRoles }}</span>
                    </template>
                </el-table-column>
                <el-table-column label="人员MAC地址" prop="deviceNo" align="center" width="100px">
                <!-- <el-table-column label="人员MAC地址" prop="deviceNo" align="center" width="100px">
                    <template slot-scope="scope">
                        <span>{{ scope.row.deviceNo}}</span>
                    </template>
@@ -226,7 +226,7 @@
                        <span>{{ scope.row.endtime}}</span>
                    </template>

                </el-table-column>
                </el-table-column> -->
                <el-table-column label="是否单位负责人" prop="iscompany" align="center" width="100px">
                    <template slot-scope="scope">
                        <div v-for="item in isList">
@@ -1172,7 +1172,7 @@
                            })
                            _this.getUserList()
                        } else {
                            parseError({ error: res.data.message, vm: _this })
                            parseError({ error: res.message, vm: _this })
                        }
                    })
                    .catch((error) => {