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

xiangpei

2024-07-11 595f08770a5dca4954c4fc0225d3585504a4bbdd

 src/views/user/admin/edit.vue

@@ -74,7 +74,7 @@
    if (id && parseInt(id) !== 0) {
      _this.formLoading = true
      userApi.selectUser(id).then(re => {
        _this.form = re.response
        _this.form = re.data
        _this.formLoading = false
      })
    }