Merge remote-tracking branch 'origin/dev_ic_platform' into develop

epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerAgencyDao.xml

@@ -295,7 +295,8 @@
             ib.BUILDING_NAME as buildingName,
             ih.BUILDING_UNIT_ID as buildingUnitId,
             u.UNIT_NAME as unitName,
-            ih.DOOR_NAME as doorName
+            ih.DOOR_NAME as doorName,
+            ih.house_type
         FROM
             ic_house ih
                 left JOIN ic_neighbor_hood n ON ( ih.NEIGHBOR_HOOD_ID = n.id )

epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcFormItemServiceImpl.java

@@ -118,7 +118,7 @@ public class IcFormItemServiceImpl extends BaseServiceImpl<IcFormItemDao, IcForm
     @Override
     public List<TableHeaderResultDTO> queryTableHeaderList(CustomerFormQueryDTO formDto) {
         List<TableHeaderResultDTO> list=new ArrayList<>();
-        list.add(new TableHeaderResultDTO("所在网格","GRID_NAME","input"));
+        //list.add(new TableHeaderResultDTO("所在网格","GRID_NAME","input"));
         //list.add(new TableHeaderResultDTO("小区","VILLAGE_NAME","input"));
         //list.add(new TableHeaderResultDTO("楼栋","BUILD_NAME","input"));
         //list.add(new TableHeaderResultDTO("单元","UNIT_NAME","input"));