diff --git a/epmet-cloud-generator/src/main/resources/template/Controller.java.vm b/epmet-cloud-generator/src/main/resources/template/Controller.java.vm
index b0aaad89eb..1e489dca52 100644
--- a/epmet-cloud-generator/src/main/resources/template/Controller.java.vm
+++ b/epmet-cloud-generator/src/main/resources/template/Controller.java.vm
@@ -71,6 +71,12 @@ public class ${className}Controller {
         return new Result();
     }
 
+    @GetMapping("export")
+    public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
+        List<${className}DTO> list = ${classname}Service.list(params);
+        ExcelUtils.exportExcelToTarget(response, null, list, ${className}Excel.class);
+    }
+
 
 
 }
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/IndexController.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/IndexController.java
index 1e4a67a0b9..4a566e9226 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/IndexController.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/IndexController.java
@@ -156,7 +156,7 @@ public class IndexController {
 
     /**
      * @param formDTO
-     * @Description 数字社区：数据分析-动力网格
+     * @Description 数字社区：数据分析-动力网格 数据由市北服务端自己添加的
      * @author sun
      */
     @PostMapping("advancedbranchrank-shibei")
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/ImportGeneralDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/ImportGeneralDTO.java
index 1d4419e661..ac3316379f 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/ImportGeneralDTO.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/ImportGeneralDTO.java
@@ -138,6 +138,8 @@ public class ImportGeneralDTO implements Serializable {
 
     private Boolean existStatus = false;
 
+    private Boolean addStatus = false;
+
     /**
      * 错误信息添加状态
      */
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcHouseFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcHouseFormDTO.java
index 58376e2032..fb679755d7 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcHouseFormDTO.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcHouseFormDTO.java
@@ -87,19 +87,16 @@ public class IcHouseFormDTO implements Serializable {
     /**
      * 房主姓名
      */
-    @NotBlank(message = "房主姓名不能为空", groups = {AddShowGroup.class, UpdateShowGroup.class})
     private String ownerName;
 
     /**
      * 房主电话
      */
-    @NotBlank(message = "房主电话不能为空", groups = {AddShowGroup.class, UpdateShowGroup.class})
     private String ownerPhone;
 
     /**
      * 房主身份证号
      */
-    @NotBlank(message = "房主身份证号不能为空", groups = {AddShowGroup.class, UpdateShowGroup.class})
     private String ownerIdCard;
 
-}
\ No newline at end of file
+}
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/ExistHouseInfoResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/ExistHouseInfoResultDTO.java
new file mode 100644
index 0000000000..561925a7c1
--- /dev/null
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/ExistHouseInfoResultDTO.java
@@ -0,0 +1,19 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2022/3/25 10:46
+ * @DESC
+ */
+@Data
+public class ExistHouseInfoResultDTO implements Serializable {
+
+    private static final long serialVersionUID = -6350975846409029631L;
+
+    private String name;
+    private String houseId;
+}
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/constant/ImportErrorMsgConstants.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/constant/ImportErrorMsgConstants.java
index 6dce569719..be68d37843 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/constant/ImportErrorMsgConstants.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/constant/ImportErrorMsgConstants.java
@@ -9,7 +9,7 @@ public interface ImportErrorMsgConstants {
 
     String EXIST_ERROR = "数据已存在";
 
-    String HOUSE_ERROR = "所属组织、所属网格、所属小区、所属楼栋、单元号、房屋类型、房屋用途、出租、房主姓名、房主电话、房主身份证的值未填写，或者所填写信息在系统中未找到";
+    String HOUSE_ERROR = "所属组织、所属网格、所属小区、所属楼栋、单元号、房屋类型、房屋用途、出租的值未填写，或者所填写信息在系统中未找到";
 
     String BUILDING_ERROR = "所属组织、所属网格、所属小区、楼栋类型、单元数的值未填写，或者所填写信息在系统中未找到";
 
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcBuildingDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcBuildingDao.java
index 87ee60fcd4..787bf47679 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcBuildingDao.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcBuildingDao.java
@@ -22,6 +22,7 @@ import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.dto.ImportGeneralDTO;
 import com.epmet.dto.result.BaseInfoFamilyBuildingResultDTO;
 import com.epmet.dto.result.BuildingResultDTO;
+import com.epmet.dto.result.ExistHouseInfoResultDTO;
 import com.epmet.dto.result.UpdateBuildingHouseNumResultDTO;
 import com.epmet.entity.CustomerAgencyEntity;
 import com.epmet.entity.IcBuildingEntity;
@@ -161,7 +162,7 @@ public interface IcBuildingDao extends BaseDao<IcBuildingEntity> {
      * @author zxc
      * @date 2022/2/14 5:32 下午
      */
-    List<String> selectExistHouse(@Param("ids")List<String> ids);
+    List<ExistHouseInfoResultDTO> selectExistHouse(@Param("ids")List<String> ids);
 
     /**
      * Desc: 查询客户下户数为空的
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java
index 28c0014f19..f4b4a2c402 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java
@@ -1,24 +1,8 @@
-/**
- * Copyright 2018 人人开源 https://www.renren.io
- * <p>
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * <p>
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * <p>
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
 package com.epmet.dao;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.ImportGeneralDTO;
 import com.epmet.dto.result.HouseInfoDTO;
 import com.epmet.dto.result.NeighborHoodManageDelResultDTO;
 import com.epmet.entity.IcHouseEntity;
@@ -100,4 +84,12 @@ public interface IcHouseDao extends BaseDao<IcHouseEntity> {
      */
     List<String> selectHouseNames(@Param("ids")List<String> ids);
 
+    /**
+     * Desc: 批量更新房屋信息
+     * @param houses
+     * @author zxc
+     * @date 2022/3/25 10:22
+     */
+    void houseUpdate(@Param("houses") List<ImportGeneralDTO> houses);
+
 }
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportHouseInfoListener.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportHouseInfoListener.java
index ea8c98c040..f69987a7b6 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportHouseInfoListener.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportHouseInfoListener.java
@@ -15,6 +15,7 @@ import com.epmet.dao.IcBuildingDao;
 import com.epmet.dto.ImportGeneralDTO;
 import com.epmet.dto.form.ImportInfoFormDTO;
 import com.epmet.dto.form.ImportTaskCommonFormDTO;
+import com.epmet.dto.result.ExistHouseInfoResultDTO;
 import com.epmet.dto.result.ImportResultDTO;
 import com.epmet.dto.result.UpdateBuildingHouseNumResultDTO;
 import com.epmet.entity.IcHouseEntity;
@@ -48,6 +49,7 @@ public class ImportHouseInfoListener extends AnalysisEventListener<HouseInfoMode
 
     List<ImportGeneralDTO> needDisposeList = new ArrayList<>();
     List<ImportGeneralDTO> needInsertList = new ArrayList<>();
+    List<ImportGeneralDTO> needUpdateList = new ArrayList<>();
 
     String gridName = null;
     String agencyName = null;
@@ -125,21 +127,6 @@ public class ImportHouseInfoListener extends AnalysisEventListener<HouseInfoMode
             disposeErrorMsg(info, "是否出租的值未填写");
             return;
         }
-        if(StringUtils.isBlank(data.getOwnerIdCard())){
-            nums.add(num);
-            disposeErrorMsg(info, "房主身份证的值未填写");
-            return;
-        }
-        if(StringUtils.isBlank(data.getOwnerName())){
-            nums.add(num);
-            disposeErrorMsg(info, "房主姓名的值未填写");
-            return;
-        }
-        if(StringUtils.isBlank(data.getOwnerPhone())){
-            nums.add(num);
-            disposeErrorMsg(info, "房主电话的值未填写");
-            return;
-        }
         if(StringUtils.isBlank(data.getDoorName())){
             nums.add(num);
             disposeErrorMsg(info, "门牌号的值未填写");
@@ -208,37 +195,45 @@ public class ImportHouseInfoListener extends AnalysisEventListener<HouseInfoMode
         if (CollectionUtils.isEmpty(needInsertList)){
             return;
         }
+        // 根据单元ID_doorName查询已存在的
+        List<String> ids = needInsertList.stream().filter(n -> StringUtils.isNotBlank(n.getBuildingUnitId())).map(m -> m.getBuildingUnitId() + "_" + m.getDoorName()).distinct().collect(Collectors.toList());
+        List<ExistHouseInfoResultDTO> existHouses = icBuildingDao.selectExistHouse(ids);
         Map<String, Long> collect = needInsertList.stream().collect(Collectors.groupingBy(n -> n.getBuildingUnitId() + "_" + n.getDoorName(), Collectors.counting()));
         collect.forEach((k,v) -> {
             if (Integer.valueOf(v.toString()).compareTo(1) != 0){
                 for (ImportGeneralDTO r : needInsertList) {
                     if (k.equals(r.getBuildingUnitId()+"_"+r.getDoorName())){
-                        // 只添加没添加过的
+                        // 集合里重复的
+                        /*nums.add(r.getNum());
+                        disposeErrorMsg(info,ImportErrorMsgConstants.EXIST_ERROR);
+                        r.setExistStatus(true);*/
                         if (!r.getAddStatus()){
-                            // 集合里重复的
-                            nums.add(r.getNum());
-                            HouseInfoModel houseInfoModel = ConvertUtils.sourceToTarget(r, HouseInfoModel.class);
-                            disposeErrorMsg(houseInfoModel,ImportErrorMsgConstants.EXIST_ERROR);
-                            r.setExistStatus(true);
+                            for (ExistHouseInfoResultDTO existHouse : existHouses) {
+                                if (existHouse.getName().equals(r.getBuildingUnitId()+"_"+r.getDoorName())){
+                                    r.setHouseId(existHouse.getHouseId());
+                                    break;
+                                }
+                            }
+                            needUpdateList.add(r);
                             r.setAddStatus(true);
+                            r.setExistStatus(true);
                         }
                     }
                 }
             }
         });
-        // 根据单元ID_doorName查询已存在的
-        List<String> ids = needInsertList.stream().filter(n -> StringUtils.isNotBlank(n.getBuildingUnitId())).map(m -> m.getBuildingUnitId() + "_" + m.getDoorName()).distinct().collect(Collectors.toList());
-        List<String> existHouses = icBuildingDao.selectExistHouse(ids);
         existHouses.forEach(e -> {
             for (ImportGeneralDTO n : needInsertList) {
-                if ((n.getBuildingUnitId()+"_"+n.getDoorName()).equals(e)){
+                if ((n.getBuildingUnitId()+"_"+n.getDoorName()).equals(e.getName())){
+                    // 库里存在的
+//                    nums.add(n.getNum());
+//                    disposeErrorMsg(info,ImportErrorMsgConstants.EXIST_ERROR);
+//                    n.setExistStatus(true);
                     if (!n.getAddStatus()){
-                        // 库里存在的
-                        nums.add(n.getNum());
-                        HouseInfoModel houseInfoModel = ConvertUtils.sourceToTarget(n, HouseInfoModel.class);
-                        disposeErrorMsg(houseInfoModel,ImportErrorMsgConstants.EXIST_ERROR);
-                        n.setExistStatus(true);
+                        n.setHouseId(e.getHouseId());
+                        needUpdateList.add(n);
                         n.setAddStatus(true);
+                        n.setExistStatus(true);
                     }
                 }
             }
@@ -247,6 +242,7 @@ public class ImportHouseInfoListener extends AnalysisEventListener<HouseInfoMode
         Map<Boolean, List<ImportGeneralDTO>> groupByExistStatus = needInsertList.stream().collect(Collectors.groupingBy(ImportGeneralDTO::getExistStatus));
         List<ImportGeneralDTO> importGeneralDTOS = groupByExistStatus.get(false);
         houseInsert(importGeneralDTOS);
+        houseUpdate(needUpdateList);
         // 清除
         needDisposeList = new ArrayList<>();
         needInsertList = new ArrayList<>();
@@ -535,13 +531,16 @@ public class ImportHouseInfoListener extends AnalysisEventListener<HouseInfoMode
     public void doAfterAllAnalysed(AnalysisContext context) {
         finalDispose();
         // 更新ic_building户数
-        List<String> list = icBuildingDao.selectHouseTotalIsNull(formDTO.getCustomerId());
+        /**
+         * 2022-03-25 又根据要求，注释更新ic_building户数
+         */
+        /*List<String> list = icBuildingDao.selectHouseTotalIsNull(formDTO.getCustomerId());
         if (!CollectionUtils.isEmpty(list)){
             List<UpdateBuildingHouseNumResultDTO> houseNum = icBuildingDao.selectHouseNum(list);
             if (!CollectionUtils.isEmpty(houseNum)){
                 icBuildingDao.allUpdateHouseNum(houseNum);
             }
-        }
+        }*/
         // 删除缓存
         icHouseRedis.delTemporaryCacheGrids(formDTO.getCustomerId(), formDTO.getUserId());
         icHouseRedis.delTemporaryCacheNeighBorHood(formDTO.getCustomerId(), formDTO.getUserId());
@@ -585,4 +584,11 @@ public class ImportHouseInfoListener extends AnalysisEventListener<HouseInfoMode
         }
     }
 
+    @Transactional(rollbackFor = Exception.class)
+    public void houseUpdate(List<ImportGeneralDTO> houses){
+        if (!CollectionUtils.isEmpty(houses)){
+            icHouseService.houseUpdate(houses);
+        }
+    }
+
 }
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcHouseService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcHouseService.java
index 66f02d80fa..e2110550bf 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcHouseService.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcHouseService.java
@@ -1,20 +1,3 @@
-/**
- * Copyright 2018 人人开源 https://www.renren.io
- * <p>
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * <p>
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * <p>
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
 package com.epmet.service;
 
 import com.epmet.commons.mybatis.service.BaseService;
@@ -22,6 +5,7 @@ import com.epmet.commons.tools.dto.result.OptionResultDTO;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.dto.IcHouseDTO;
+import com.epmet.dto.ImportGeneralDTO;
 import com.epmet.dto.form.HouseFormDTO;
 import com.epmet.dto.result.HouseListResultDTO;
 import com.epmet.entity.IcHouseEntity;
@@ -124,4 +108,12 @@ public interface IcHouseService extends BaseService<IcHouseEntity> {
      */
     List<HouseListResultDTO> getHouseList(TokenDto tokenDto, HouseFormDTO formDTO);
 
+    /**
+     * Desc: 批量更新房屋信息
+     * @param houses
+     * @author zxc
+     * @date 2022/3/25 10:22
+     */
+    void houseUpdate(List<ImportGeneralDTO> houses);
+
 }
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java
index b6d0585694..0e32dbef1e 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java
@@ -1,20 +1,3 @@
-/**
- * Copyright 2018 人人开源 https://www.renren.io
- * <p>
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * <p>
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * <p>
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
 package com.epmet.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -33,6 +16,7 @@ import com.epmet.dao.IcHouseDao;
 import com.epmet.dto.IcHouseDTO;
 import com.epmet.dto.IcResiCategoryStatsConfigDTO;
 import com.epmet.dto.IcResiUserDTO;
+import com.epmet.dto.ImportGeneralDTO;
 import com.epmet.dto.form.HouseFormDTO;
 import com.epmet.dto.result.HouseListResultDTO;
 import com.epmet.entity.IcHouseEntity;
@@ -141,7 +125,7 @@ public class IcHouseServiceImpl extends BaseServiceImpl<IcHouseDao, IcHouseEntit
         return list.stream().map(item -> {
             OptionResultDTO dto = new OptionResultDTO();
             dto.setValue(item.getId());
-            dto.setLabel(item.getHouseName());
+            dto.setLabel(item.getDoorName());
             return dto;
         }).collect(Collectors.toList());
     }
@@ -235,4 +219,16 @@ public class IcHouseServiceImpl extends BaseServiceImpl<IcHouseDao, IcHouseEntit
         }).collect(Collectors.toList());
     }
 
+    /**
+     * Desc: 批量更新房屋信息
+     * @param houses
+     * @author zxc
+     * @date 2022/3/25 10:22
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void houseUpdate(List<ImportGeneralDTO> houses) {
+        baseDao.houseUpdate(houses);
+    }
+
 }
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.14__ic_house_remove_owner.sql b/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.14__ic_house_remove_owner.sql
new file mode 100644
index 0000000000..edf66e716e
--- /dev/null
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.14__ic_house_remove_owner.sql
@@ -0,0 +1,4 @@
+ALTER TABLE `epmet_gov_org`.`ic_house`
+    MODIFY COLUMN `OWNER_NAME` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '房主姓名' AFTER `RENT_FLAG`,
+    MODIFY COLUMN `OWNER_PHONE` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '房主电话' AFTER `OWNER_NAME`,
+    MODIFY COLUMN `OWNER_ID_CARD` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '房主身份证号' AFTER `OWNER_PHONE`;
diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml
index c2482d86af..190f93904a 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml
@@ -335,8 +335,11 @@
     </select>
 
     <!-- 查询已存在的房屋 -->
-    <select id="selectExistHouse" resultType="java.lang.String">
-        SELECT CONCAT(BUILDING_UNIT_ID,'_',DOOR_NAME) FROM ic_house
+    <select id="selectExistHouse" resultType="com.epmet.dto.result.ExistHouseInfoResultDTO">
+        SELECT
+               CONCAT(BUILDING_UNIT_ID,'_',DOOR_NAME) AS name,
+               ID AS houseId
+        FROM ic_house
         WHERE DEL_FLAG = '0'
           AND CONCAT(BUILDING_UNIT_ID,'_',DOOR_NAME) IN
             (
diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml
index 4a53158d3e..b8f3bfef66 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml
@@ -26,6 +26,50 @@
         <result property="updatedTime" column="UPDATED_TIME"/>
     </resultMap>
 
+    <!-- 批量更新房屋信息 -->
+    <update id="houseUpdate">
+        UPDATE ic_house
+        <trim prefix="set" suffixOverrides=",">
+            <trim prefix="HOUSE_TYPE =(case" suffix="end),">
+                <foreach collection="houses" item="h">
+                    when id = #{h.houseId} then #{h.houseType}
+                </foreach>
+            </trim>
+            <trim prefix="PURPOSE =(case" suffix="end),">
+                <foreach collection="houses" item="h">
+                    when id = #{h.houseId} then #{h.purpose}
+                </foreach>
+            </trim>
+            <trim prefix="RENT_FLAG =(case" suffix="end),">
+                <foreach collection="houses" item="h">
+                    when id = #{h.houseId} then #{h.rentFlag}
+                </foreach>
+            </trim>
+            <trim prefix="OWNER_NAME =(case" suffix="end),">
+                <foreach collection="houses" item="h">
+                    when id = #{h.houseId} then #{h.ownerName}
+                </foreach>
+            </trim>
+            <trim prefix="OWNER_PHONE =(case" suffix="end),">
+                <foreach collection="houses" item="h">
+                    when id = #{h.houseId} then #{h.ownerPhone}
+                </foreach>
+            </trim>
+            <trim prefix="OWNER_ID_CARD =(case" suffix="end),">
+                <foreach collection="houses" item="h">
+                    when id = #{h.houseId} then #{h.ownerIdCard}
+                </foreach>
+            </trim>
+            UPDATED_TIME = NOW()
+        </trim>
+        WHERE DEL_FLAG = '0'
+        AND ID IN (
+              <foreach collection="houses" item="h" separator=",">
+                #{h.houseId}
+            </foreach>
+            )
+    </update>
+
     <!--<select id="searchHouseByPage" resultType="map">
             select
             a.ID as houseId,
diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcFormItemServiceImpl.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcFormItemServiceImpl.java
index 3afb6df67e..e7afee12c9 100644
--- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcFormItemServiceImpl.java
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcFormItemServiceImpl.java
@@ -71,6 +71,15 @@ public class IcFormItemServiceImpl extends BaseServiceImpl<IcFormItemDao, IcForm
         //list.add(new TableHeaderResultDTO("所在家庭","HOME_NAME","input"));
         //改为查询ic_form_list_item
         List<TableHeaderResultDTO> result=baseDao.queryTableHeaderList(formDto.getCustomerId(),formDto.getFormCode());
+
+        for (TableHeaderResultDTO column : result) {
+            if ("HOME_ID".equals(column.getColumnName())) {
+                // web界面table
+                column.setLabel("所属房屋");
+                break;
+            }
+        }
+
         if(!CollectionUtils.isEmpty(result)){
             list.addAll(result);
         }
diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.17__update_sort_idcard.sql b/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.17__update_sort_idcard.sql
new file mode 100644
index 0000000000..9d383f58d9
--- /dev/null
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.17__update_sort_idcard.sql
@@ -0,0 +1,12 @@
+UPDATE ic_form_list_item 
+SET SORT = '5' 
+WHERE
+	FORM_ITEM_ID IN ( SELECT i.id FROM ic_form_item i WHERE i.LABEL LIKE '%身份证%' AND i.DEL_FLAG = '0' ) 
+	AND DEL_FLAG = '0';
+	
+UPDATE ic_form_list_item 
+SET SORT = '6' 
+WHERE
+	FORM_ITEM_ID IN ( SELECT i.id FROM ic_form_item i WHERE i.LABEL LIKE '%性别%' AND i.DEL_FLAG = '0' ) 
+	AND DEL_FLAG = '0';
+	
\ No newline at end of file
diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.18__updateSuoShuJiaTing.sql b/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.18__updateSuoShuJiaTing.sql
new file mode 100644
index 0000000000..9b4cfd165c
--- /dev/null
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.18__updateSuoShuJiaTing.sql
@@ -0,0 +1 @@
+update ic_form_item set LABEL='房间号' where LABEL='所属家庭';
\ No newline at end of file
diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.19__update_addform_idcard_sort.sql b/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.19__update_addform_idcard_sort.sql
new file mode 100644
index 0000000000..5305539887
--- /dev/null
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.19__update_addform_idcard_sort.sql
@@ -0,0 +1,2 @@
+update ic_form_item set SORT='8',UPDATED_TIME=NOW()  where LABEL='身份证号' and DEL_FLAG='0';
+update ic_form_item set SORT='9' ,UPDATED_TIME=NOW()  where LABEL='性别' and DEL_FLAG='0';
\ No newline at end of file
diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.20__updateSuoShuJiaTing.sql b/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.20__updateSuoShuJiaTing.sql
new file mode 100644
index 0000000000..d60b78b385
--- /dev/null
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.20__updateSuoShuJiaTing.sql
@@ -0,0 +1 @@
+update ic_form_item set LABEL='门牌号' where LABEL='房间号';
\ No newline at end of file
diff --git a/epmet-user/epmet-user-server/src/main/resources/excel/ic_resi_info_cid_for_easy_excel.xlsx b/epmet-user/epmet-user-server/src/main/resources/excel/ic_resi_info_cid_for_easy_excel.xlsx
index bb88725ee6..c72b970c03 100644
Binary files a/epmet-user/epmet-user-server/src/main/resources/excel/ic_resi_info_cid_for_easy_excel.xlsx and b/epmet-user/epmet-user-server/src/main/resources/excel/ic_resi_info_cid_for_easy_excel.xlsx differ
diff --git a/epmet-user/epmet-user-server/src/main/resources/excel/ic_resi_info_import_cid_for_easy_excel.xls b/epmet-user/epmet-user-server/src/main/resources/excel/ic_resi_info_import_cid_for_easy_excel.xls
index 3be61c72ad..23c9c692af 100644
Binary files a/epmet-user/epmet-user-server/src/main/resources/excel/ic_resi_info_import_cid_for_easy_excel.xls and b/epmet-user/epmet-user-server/src/main/resources/excel/ic_resi_info_import_cid_for_easy_excel.xls differ