Merge branch 'master' of https://sinanoaq.cn:8888/r/ztqt

Your Name

2022-05-11 b13cb248d822bafcc0c0896e082be9425cfb052e

Merge branch 'master' of https://sinanoaq.cn:8888/r/ztqt

 src/views/systemManage/userManage/index.vue

@@ -830,7 +830,7 @@
                                })
                                _this.getUserList()
                            } else {
                                parseError({ error: res.data.message, vm: _this })
                                parseError({ error: res.message, vm: _this })
                            }
                        }).catch(error => {
                            parseError({ error: error, vm: _this })
@@ -954,7 +954,7 @@
                                })
                                _this.getUserList()
                            } else {
                                parseError({ error: res.data.message, vm: _this })
                                parseError({ error: res.message, vm: _this })
                            }
                        }).catch(error => {
                            parseError({ error: error, vm: _this })