Merge branch 'v1.1' into dev

src/views/components/editResi.vue

@@ -399,7 +399,7 @@
                 ></el-button>
                 <el-button
                   type="danger"
-                  v-if="form.resideInfoDtos.length > 1"
+                  v-if="form.resideInfoDtos.length > 1 && rowItem.accessable !== 0"
                   size="small"
                   icon="el-icon-minus"
                   @click="handelClickDelHouse(index)"
@@ -1883,7 +1883,7 @@ export default {
       this.$http
         .post("/actual/base/communityQuarters/listQuartersOptions", {
           gridId: this.form.resideInfoDtos[index].gridId,
-          agencyId: user.agencyId,
+          agencyId:this.form.resideInfoDtos[index].agencyId ||  user.agencyId,
         })
         .then(({ data: res }) => {
           if (res.code !== 0) {