Merge remote-tracking branch 'origin/feature/dev_zz_wgh' into 市北master

# Conflicts: # src/views/modules/base/organization/organization.vue
3 years ago · b9b8a8853d
1 changed files with 1 additions and 1 deletions
--- a/src/views/modules/base/organization/organization.vue
+++ b/src/views/modules/base/organization/organization.vue
@ -2319,7 +2319,7 @@ export default {
        this.modifyGridFrom.agencyId = data.agencyId
        this.modifyGridFrom.gridType = data.gridType
        this.modifyGridFrom.manageDistrict = data.manageDistrict
-        this.modifyGridFrom.griId = data.griId
+        this.modifyGridFrom.griId = data.grid
      } else {
        this.$message.error(msg)
      }