修改：居民信息导入的模板，基础信息拆分为2级表头

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java

@@ -46,6 +46,7 @@ import com.epmet.commons.tools.security.user.LoginUserUtil;
 import com.epmet.commons.tools.utils.*;
 import com.epmet.commons.tools.utils.poi.excel.FreezeAndFilter;
 import com.epmet.commons.tools.validator.ValidatorUtils;
+import com.epmet.commons.tools.validator.group.ExportGroup;
 import com.epmet.constant.SystemMessageType;
 import com.epmet.constants.ImportTaskConstants;
 import com.epmet.dto.IcResiUserDTO;
@@ -416,7 +417,7 @@ public class IcResiUserController implements ResultDataResolver {
     public void exportExcelCustom(/*@LoginUser*/ TokenDto tokenDto, @RequestBody IcResiUserPageFormDTO pageFormDTO, HttpServletResponse response) throws Exception {
         //tokenDto.setUserId("9e37adcce6472152e6508a19d3683e02");
         //tokenDto.setCustomerId("45687aa479955f9d06204d415238f7cc");
-        ValidatorUtils.validateEntity(pageFormDTO, IcResiUserPageFormDTO.AddUserInternalGroup.class,ExportGroup.class);
+        ValidatorUtils.validateEntity(pageFormDTO, IcResiUserPageFormDTO.AddUserInternalGroup.class, ExportGroup.class);
         //获取导出配置
         icResiUserExportService.exportIcResiUser(pageFormDTO,response);
 

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java

@@ -90,7 +90,7 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res
     /**
      * 身份证号列序号
      */
-    public static final Integer ID_CARD_COLUMN_NO = 9;
+    public static final Integer ID_CARD_COLUMN_NO = 8;
     /**
      * 姓名列序号
      */