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

project/fengdu/app/AppIntegratingRules/components/List.vue

@@ -65,14 +65,6 @@
             </el-form-item>
 
             <el-form-item label="有效地区" prop="girdName" required>
-              <!-- <ai-area-select
-                clearable
-                @fullname="v => form.areaName = v"
-                :disabled-level="$store.state.user.info.areaList.length"
-                always-show
-                :instance="instance"
-                v-model="form.areaId">
-              </ai-area-select> -->
               <ai-picker
                 :instance="instance"
                 dialogTitle="选择网格"

project/fengdu/app/AppResidentInfo/components/Add.vue

@@ -527,7 +527,7 @@ export default {
             ...res.data
           };
           // this.family = res.data.family;
-          this.IdCard(this.idNumber);
+          this.IdCard(res.data.idNumber);
         }
       });
     },