From 437acd3e9031f3ab2bbe6c1105914a466378eca3 Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Tue, 26 Oct 2021 13:51:53 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/epmet/dto/IcFormDTO.java    |  91 +++
 .../java/com/epmet/dto/IcFormItemDTO.java     | 171 ++++++
 .../com/epmet/dto/IcFormItemGroupDTO.java     | 111 ++++
 .../com/epmet/dto/IcFormItemOptionsDTO.java   | 106 ++++
 .../main/java/com/epmet/dto/ItemTypeDTO.java  |  81 +++
 .../epmet/controller/IcFormController.java    |  94 ++++
 .../controller/IcFormItemController.java      |  94 ++++
 .../controller/IcFormItemGroupController.java |  94 ++++
 .../IcFormItemOptionsController.java          |  94 ++++
 .../epmet/controller/ItemTypeController.java  |  94 ++++
 .../main/java/com/epmet/dao/IcFormDao.java    |  33 ++
 .../java/com/epmet/dao/IcFormItemDao.java     |  33 ++
 .../com/epmet/dao/IcFormItemGroupDao.java     |  33 ++
 .../com/epmet/dao/IcFormItemOptionsDao.java   |  33 ++
 .../main/java/com/epmet/dao/ItemTypeDao.java  |  33 ++
 .../java/com/epmet/entity/IcFormEntity.java   |  61 ++
 .../com/epmet/entity/IcFormItemEntity.java    | 141 +++++
 .../epmet/entity/IcFormItemGroupEntity.java   |  81 +++
 .../epmet/entity/IcFormItemOptionsEntity.java |  76 +++
 .../java/com/epmet/entity/ItemTypeEntity.java |  51 ++
 .../java/com/epmet/excel/IcFormExcel.java     |  68 +++
 .../java/com/epmet/excel/IcFormItemExcel.java | 116 ++++
 .../com/epmet/excel/IcFormItemGroupExcel.java |  80 +++
 .../epmet/excel/IcFormItemOptionsExcel.java   |  77 +++
 .../java/com/epmet/excel/ItemTypeExcel.java   |  62 +++
 .../epmet/service/IcFormItemGroupService.java |  95 ++++
 .../service/IcFormItemOptionsService.java     |  95 ++++
 .../com/epmet/service/IcFormItemService.java  |  95 ++++
 .../java/com/epmet/service/IcFormService.java |  95 ++++
 .../com/epmet/service/ItemTypeService.java    |  95 ++++
 .../impl/IcFormItemGroupServiceImpl.java      | 100 ++++
 .../impl/IcFormItemOptionsServiceImpl.java    | 100 ++++
 .../service/impl/IcFormItemServiceImpl.java   | 100 ++++
 .../epmet/service/impl/IcFormServiceImpl.java | 100 ++++
 .../service/impl/ItemTypeServiceImpl.java     | 100 ++++
 .../src/main/resources/mapper/IcFormDao.xml   |   7 +
 .../main/resources/mapper/IcFormItemDao.xml   |   8 +
 .../resources/mapper/IcFormItemGroupDao.xml   |   8 +
 .../resources/mapper/IcFormItemOptionsDao.xml |   8 +
 .../src/main/resources/mapper/ItemTypeDao.xml |   8 +
 .../java/com/epmet/dto/IcEnsureHouseDTO.java  | 131 +++++
 .../java/com/epmet/dto/IcOldPeopleDTO.java    | 111 ++++
 .../java/com/epmet/dto/IcPartyMemberDTO.java  | 146 +++++
 .../java/com/epmet/dto/IcResiDemandDTO.java   | 131 +++++
 .../java/com/epmet/dto/IcResiUserDTO.java     | 526 ++++++++++++++++++
 .../main/java/com/epmet/dto/IcSpecialDTO.java | 111 ++++
 .../java/com/epmet/dto/IcUnemployedDTO.java   | 151 +++++
 .../java/com/epmet/dto/IcUnitedFrontDTO.java  | 116 ++++
 .../java/com/epmet/dto/IcVeteransDTO.java     | 146 +++++
 .../java/com/epmet/dto/IcVolunteerDTO.java    | 116 ++++
 .../controller/IcResiUserController.java      |  94 ++++
 .../java/com/epmet/dao/IcResiUserDao.java     |  33 ++
 .../com/epmet/entity/IcEnsureHouseEntity.java | 101 ++++
 .../com/epmet/entity/IcOldPeopleEntity.java   |  81 +++
 .../com/epmet/entity/IcPartyMemberEntity.java | 116 ++++
 .../com/epmet/entity/IcResiDemandEntity.java  | 101 ++++
 .../com/epmet/entity/IcResiUserEntity.java    | 496 +++++++++++++++++
 .../com/epmet/entity/IcSpecialEntity.java     |  81 +++
 .../com/epmet/entity/IcUnemployedEntity.java  | 121 ++++
 .../com/epmet/entity/IcUnitedFrontEntity.java |  86 +++
 .../com/epmet/entity/IcVeteransEntity.java    | 116 ++++
 .../com/epmet/entity/IcVolunteerEntity.java   |  86 +++
 .../com/epmet/excel/IcEnsureHouseExcel.java   |  92 +++
 .../com/epmet/excel/IcOldPeopleExcel.java     |  80 +++
 .../com/epmet/excel/IcPartyMemberExcel.java   | 101 ++++
 .../com/epmet/excel/IcResiDemandExcel.java    |  92 +++
 .../java/com/epmet/excel/IcResiUserExcel.java | 329 +++++++++++
 .../java/com/epmet/excel/IcSpecialExcel.java  |  80 +++
 .../com/epmet/excel/IcUnemployedExcel.java    | 104 ++++
 .../com/epmet/excel/IcUnitedFrontExcel.java   |  83 +++
 .../java/com/epmet/excel/IcVeteransExcel.java | 101 ++++
 .../com/epmet/excel/IcVolunteerExcel.java     |  83 +++
 .../java/com/epmet/redis/IcResiUserRedis.java |  47 ++
 .../com/epmet/service/IcResiUserService.java  |  95 ++++
 .../service/impl/IcResiUserServiceImpl.java   | 104 ++++
 .../main/resources/mapper/IcResiUserDao.xml   |   8 +
 76 files changed, 7618 insertions(+)
 create mode 100644 epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/IcFormDTO.java
 create mode 100644 epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/IcFormItemDTO.java
 create mode 100644 epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/IcFormItemGroupDTO.java
 create mode 100644 epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/IcFormItemOptionsDTO.java
 create mode 100644 epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/ItemTypeDTO.java
 create mode 100644 epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/IcFormController.java
 create mode 100644 epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/IcFormItemController.java
 create mode 100644 epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/IcFormItemGroupController.java
 create mode 100644 epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/IcFormItemOptionsController.java
 create mode 100644 epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/ItemTypeController.java
 create mode 100644 epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/IcFormDao.java
 create mode 100644 epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/IcFormItemDao.java
 create mode 100644 epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/IcFormItemGroupDao.java
 create mode 100644 epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/IcFormItemOptionsDao.java
 create mode 100644 epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/ItemTypeDao.java
 create mode 100644 epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/IcFormEntity.java
 create mode 100644 epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/IcFormItemEntity.java
 create mode 100644 epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/IcFormItemGroupEntity.java
 create mode 100644 epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/IcFormItemOptionsEntity.java
 create mode 100644 epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/ItemTypeEntity.java
 create mode 100644 epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/excel/IcFormExcel.java
 create mode 100644 epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/excel/IcFormItemExcel.java
 create mode 100644 epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/excel/IcFormItemGroupExcel.java
 create mode 100644 epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/excel/IcFormItemOptionsExcel.java
 create mode 100644 epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/excel/ItemTypeExcel.java
 create mode 100644 epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/IcFormItemGroupService.java
 create mode 100644 epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/IcFormItemOptionsService.java
 create mode 100644 epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/IcFormItemService.java
 create mode 100644 epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/IcFormService.java
 create mode 100644 epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/ItemTypeService.java
 create mode 100644 epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcFormItemGroupServiceImpl.java
 create mode 100644 epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcFormItemOptionsServiceImpl.java
 create mode 100644 epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcFormItemServiceImpl.java
 create mode 100644 epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcFormServiceImpl.java
 create mode 100644 epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/ItemTypeServiceImpl.java
 create mode 100644 epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcFormDao.xml
 create mode 100644 epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcFormItemDao.xml
 create mode 100644 epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcFormItemGroupDao.xml
 create mode 100644 epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcFormItemOptionsDao.xml
 create mode 100644 epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/ItemTypeDao.xml
 create mode 100644 epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcEnsureHouseDTO.java
 create mode 100644 epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcOldPeopleDTO.java
 create mode 100644 epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcPartyMemberDTO.java
 create mode 100644 epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcResiDemandDTO.java
 create mode 100644 epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcResiUserDTO.java
 create mode 100644 epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcSpecialDTO.java
 create mode 100644 epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcUnemployedDTO.java
 create mode 100644 epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcUnitedFrontDTO.java
 create mode 100644 epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcVeteransDTO.java
 create mode 100644 epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcVolunteerDTO.java
 create mode 100644 epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java
 create mode 100644 epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java
 create mode 100644 epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcEnsureHouseEntity.java
 create mode 100644 epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcOldPeopleEntity.java
 create mode 100644 epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcPartyMemberEntity.java
 create mode 100644 epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiDemandEntity.java
 create mode 100644 epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiUserEntity.java
 create mode 100644 epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcSpecialEntity.java
 create mode 100644 epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcUnemployedEntity.java
 create mode 100644 epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcUnitedFrontEntity.java
 create mode 100644 epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcVeteransEntity.java
 create mode 100644 epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcVolunteerEntity.java
 create mode 100644 epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcEnsureHouseExcel.java
 create mode 100644 epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcOldPeopleExcel.java
 create mode 100644 epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPartyMemberExcel.java
 create mode 100644 epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcResiDemandExcel.java
 create mode 100644 epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcResiUserExcel.java
 create mode 100644 epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcSpecialExcel.java
 create mode 100644 epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcUnemployedExcel.java
 create mode 100644 epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcUnitedFrontExcel.java
 create mode 100644 epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcVeteransExcel.java
 create mode 100644 epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcVolunteerExcel.java
 create mode 100644 epmet-user/epmet-user-server/src/main/java/com/epmet/redis/IcResiUserRedis.java
 create mode 100644 epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java
 create mode 100644 epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java
 create mode 100644 epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml

diff --git a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/IcFormDTO.java b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/IcFormDTO.java
new file mode 100644
index 0000000000..ee14093ab1
--- /dev/null
+++ b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/IcFormDTO.java
@@ -0,0 +1,91 @@
+/**
+ * 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.dto;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ * 配置表单
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-10-26
+ */
+@Data
+public class IcFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+	private String id;
+
+    /**
+     * 客户ID
+     */
+	private String customerId;
+
+    /**
+     * 表单CODE，从字典获取
+     */
+	private String formCode;
+
+    /**
+     * 表单名称
+     */
+	private String formName;
+
+    /**
+     * 地区码，有父级用父级
+     */
+	private String areaCode;
+
+    /**
+     * 0未删除，1已删除
+     */
+	private Integer delFlag;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+}
\ No newline at end of file
diff --git a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/IcFormItemDTO.java b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/IcFormItemDTO.java
new file mode 100644
index 0000000000..f670559b57
--- /dev/null
+++ b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/IcFormItemDTO.java
@@ -0,0 +1,171 @@
+/**
+ * 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.dto;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ * 表单项
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-10-26
+ */
+@Data
+public class IcFormItemDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+	private String id;
+
+    /**
+     * 客户ID
+     */
+	private String customerId;
+
+    /**
+     * 
+     */
+	private String areaCode;
+
+    /**
+     * 表单ID
+     */
+	private String formId;
+
+    /**
+     * 表单CODE
+     */
+	private String formCode;
+
+    /**
+     * 父项ID
+     */
+	private String parentItemId;
+
+    /**
+     * 项标签
+     */
+	private String label;
+
+    /**
+     * 控件类型,EG:INPUT;从字典获取
+     */
+	private String itemType;
+
+    /**
+     * 分组ID,'默认，NONE'
+     */
+	private String itemGroupId;
+
+    /**
+     * 是否必填,1必填。0不必填
+     */
+	private Integer required;
+
+    /**
+     * 手机号：mobile; 身份证：id_card
+     */
+	private String validType;
+
+    /**
+     * 默认值
+     */
+	private String defaultValue;
+
+    /**
+     * 选项来源,REMOTE;LOCAL;如果是动态加载的下拉框或者CHECKBOX等的情况下使用。URL:接口获取(LABEL,VALUE)；JSON:直接从JSON中取
+     */
+	private String optionSourceType;
+
+    /**
+     * 来源地址,REMOTE才有，固定格式;如果OPTIONS_SOURCE是URL，则此处填写要调用的接口的URL相对路径，例如：/API/GOV/ORG/XXXX。此处不应设置参数，若需要参数应当完全由后端，通过TOKEN信息来获取
+     */
+	private String optionSourceValue;
+
+    /**
+     * 排序
+     */
+	private Integer sort;
+
+    /**
+     * 占位提示语
+     */
+	private String placeholder;
+
+    /**
+     * 是否查询显示,1展示。0不展示
+     */
+	private Integer searchDisplay;
+
+    /**
+     * 是否列表显示，1展示，0不展示
+     */
+	private Integer listDisplay;
+
+    /**
+     * 是否需要支持数据分析，1支持。0不支持
+     */
+	private Integer dataAnalyse;
+
+    /**
+     * 列名
+     */
+	private String columnName;
+
+    /**
+     * 列名序号，根据表递增
+     */
+	private Integer columnNum;
+
+    /**
+     * 0未删除，1已删除
+     */
+	private Integer delFlag;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+}
\ No newline at end of file
diff --git a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/IcFormItemGroupDTO.java b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/IcFormItemGroupDTO.java
new file mode 100644
index 0000000000..3c147dba78
--- /dev/null
+++ b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/IcFormItemGroupDTO.java
@@ -0,0 +1,111 @@
+/**
+ * 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.dto;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ * 表单项分组
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-10-26
+ */
+@Data
+public class IcFormItemGroupDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 分组id
+     */
+	private String id;
+
+    /**
+     * 客户ID
+     */
+	private String customerId;
+
+    /**
+     * 表单ID
+     */
+	private String formId;
+
+    /**
+     * 表单编码
+     */
+	private String formCode;
+
+    /**
+     * 对应的子表名称
+     */
+	private String tableName;
+
+    /**
+     * 是否支持添加一行，1支持，默认0不支持
+     */
+	private Integer supportAdd;
+
+    /**
+     * 名称
+     */
+	private String label;
+
+    /**
+     * 排序
+     */
+	private Integer sort;
+
+    /**
+     * 1展示，0不展示，默认1
+     */
+	private Integer display;
+
+    /**
+     * 0未删除，1已删除
+     */
+	private Integer delFlag;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+}
\ No newline at end of file
diff --git a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/IcFormItemOptionsDTO.java b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/IcFormItemOptionsDTO.java
new file mode 100644
index 0000000000..5505ef21dd
--- /dev/null
+++ b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/IcFormItemOptionsDTO.java
@@ -0,0 +1,106 @@
+/**
+ * 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.dto;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ * 表单项的选项
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-10-26
+ */
+@Data
+public class IcFormItemOptionsDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+	private String id;
+
+    /**
+     * 客户ID
+     */
+	private String customerId;
+
+    /**
+     * 表单ID
+     */
+	private String formId;
+
+    /**
+     * 表单CODE
+     */
+	private String formCode;
+
+    /**
+     * 表单项ID
+     */
+	private String itemId;
+
+    /**
+     * 可选项标签名
+     */
+	private String optionLabel;
+
+    /**
+     * 标签value值
+     */
+	private String optionValue;
+
+    /**
+     * 排序
+     */
+	private Integer sort;
+
+    /**
+     * 0未删除，1已删除
+     */
+	private Integer delFlag;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+}
\ No newline at end of file
diff --git a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/ItemTypeDTO.java b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/ItemTypeDTO.java
new file mode 100644
index 0000000000..9db82e8d48
--- /dev/null
+++ b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/ItemTypeDTO.java
@@ -0,0 +1,81 @@
+/**
+ * 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.dto;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ * 控件类型
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-10-26
+ */
+@Data
+public class ItemTypeDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+	private String id;
+
+    /**
+     * 名称
+     */
+	private String name;
+
+    /**
+     * CODE
+     */
+	private String code;
+
+    /**
+     * 0未删除，1已删除
+     */
+	private Integer delFlag;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+}
\ No newline at end of file
diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/IcFormController.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/IcFormController.java
new file mode 100644
index 0000000000..4e9bf2d751
--- /dev/null
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/IcFormController.java
@@ -0,0 +1,94 @@
+/**
+ * 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.controller;
+
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.utils.ExcelUtils;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.validator.AssertUtils;
+import com.epmet.commons.tools.validator.ValidatorUtils;
+import com.epmet.commons.tools.validator.group.AddGroup;
+import com.epmet.commons.tools.validator.group.UpdateGroup;
+import com.epmet.commons.tools.validator.group.DefaultGroup;
+import com.epmet.dto.IcFormDTO;
+import com.epmet.excel.IcFormExcel;
+import com.epmet.service.IcFormService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * 配置表单
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-10-26
+ */
+@RestController
+@RequestMapping("icform")
+public class IcFormController {
+    
+    @Autowired
+    private IcFormService icFormService;
+
+    @GetMapping("page")
+    public Result<PageData<IcFormDTO>> page(@RequestParam Map<String, Object> params){
+        PageData<IcFormDTO> page = icFormService.page(params);
+        return new Result<PageData<IcFormDTO>>().ok(page);
+    }
+
+    @GetMapping("{id}")
+    public Result<IcFormDTO> get(@PathVariable("id") String id){
+        IcFormDTO data = icFormService.get(id);
+        return new Result<IcFormDTO>().ok(data);
+    }
+
+    @PostMapping
+    public Result save(@RequestBody IcFormDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+        icFormService.save(dto);
+        return new Result();
+    }
+
+    @PutMapping
+    public Result update(@RequestBody IcFormDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+        icFormService.update(dto);
+        return new Result();
+    }
+
+    @DeleteMapping
+    public Result delete(@RequestBody String[] ids){
+        //效验数据
+        AssertUtils.isArrayEmpty(ids, "id");
+        icFormService.delete(ids);
+        return new Result();
+    }
+
+    @GetMapping("export")
+    public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
+        List<IcFormDTO> list = icFormService.list(params);
+        ExcelUtils.exportExcelToTarget(response, null, list, IcFormExcel.class);
+    }
+
+}
\ No newline at end of file
diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/IcFormItemController.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/IcFormItemController.java
new file mode 100644
index 0000000000..3c6bbf4004
--- /dev/null
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/IcFormItemController.java
@@ -0,0 +1,94 @@
+/**
+ * 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.controller;
+
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.utils.ExcelUtils;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.validator.AssertUtils;
+import com.epmet.commons.tools.validator.ValidatorUtils;
+import com.epmet.commons.tools.validator.group.AddGroup;
+import com.epmet.commons.tools.validator.group.UpdateGroup;
+import com.epmet.commons.tools.validator.group.DefaultGroup;
+import com.epmet.dto.IcFormItemDTO;
+import com.epmet.excel.IcFormItemExcel;
+import com.epmet.service.IcFormItemService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * 表单项
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-10-26
+ */
+@RestController
+@RequestMapping("icformitem")
+public class IcFormItemController {
+    
+    @Autowired
+    private IcFormItemService icFormItemService;
+
+    @GetMapping("page")
+    public Result<PageData<IcFormItemDTO>> page(@RequestParam Map<String, Object> params){
+        PageData<IcFormItemDTO> page = icFormItemService.page(params);
+        return new Result<PageData<IcFormItemDTO>>().ok(page);
+    }
+
+    @GetMapping("{id}")
+    public Result<IcFormItemDTO> get(@PathVariable("id") String id){
+        IcFormItemDTO data = icFormItemService.get(id);
+        return new Result<IcFormItemDTO>().ok(data);
+    }
+
+    @PostMapping
+    public Result save(@RequestBody IcFormItemDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+        icFormItemService.save(dto);
+        return new Result();
+    }
+
+    @PutMapping
+    public Result update(@RequestBody IcFormItemDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+        icFormItemService.update(dto);
+        return new Result();
+    }
+
+    @DeleteMapping
+    public Result delete(@RequestBody String[] ids){
+        //效验数据
+        AssertUtils.isArrayEmpty(ids, "id");
+        icFormItemService.delete(ids);
+        return new Result();
+    }
+
+    @GetMapping("export")
+    public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
+        List<IcFormItemDTO> list = icFormItemService.list(params);
+        ExcelUtils.exportExcelToTarget(response, null, list, IcFormItemExcel.class);
+    }
+
+}
\ No newline at end of file
diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/IcFormItemGroupController.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/IcFormItemGroupController.java
new file mode 100644
index 0000000000..b4d0079637
--- /dev/null
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/IcFormItemGroupController.java
@@ -0,0 +1,94 @@
+/**
+ * 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.controller;
+
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.utils.ExcelUtils;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.validator.AssertUtils;
+import com.epmet.commons.tools.validator.ValidatorUtils;
+import com.epmet.commons.tools.validator.group.AddGroup;
+import com.epmet.commons.tools.validator.group.UpdateGroup;
+import com.epmet.commons.tools.validator.group.DefaultGroup;
+import com.epmet.dto.IcFormItemGroupDTO;
+import com.epmet.excel.IcFormItemGroupExcel;
+import com.epmet.service.IcFormItemGroupService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * 表单项分组
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-10-26
+ */
+@RestController
+@RequestMapping("icformitemgroup")
+public class IcFormItemGroupController {
+    
+    @Autowired
+    private IcFormItemGroupService icFormItemGroupService;
+
+    @GetMapping("page")
+    public Result<PageData<IcFormItemGroupDTO>> page(@RequestParam Map<String, Object> params){
+        PageData<IcFormItemGroupDTO> page = icFormItemGroupService.page(params);
+        return new Result<PageData<IcFormItemGroupDTO>>().ok(page);
+    }
+
+    @GetMapping("{id}")
+    public Result<IcFormItemGroupDTO> get(@PathVariable("id") String id){
+        IcFormItemGroupDTO data = icFormItemGroupService.get(id);
+        return new Result<IcFormItemGroupDTO>().ok(data);
+    }
+
+    @PostMapping
+    public Result save(@RequestBody IcFormItemGroupDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+        icFormItemGroupService.save(dto);
+        return new Result();
+    }
+
+    @PutMapping
+    public Result update(@RequestBody IcFormItemGroupDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+        icFormItemGroupService.update(dto);
+        return new Result();
+    }
+
+    @DeleteMapping
+    public Result delete(@RequestBody String[] ids){
+        //效验数据
+        AssertUtils.isArrayEmpty(ids, "id");
+        icFormItemGroupService.delete(ids);
+        return new Result();
+    }
+
+    @GetMapping("export")
+    public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
+        List<IcFormItemGroupDTO> list = icFormItemGroupService.list(params);
+        ExcelUtils.exportExcelToTarget(response, null, list, IcFormItemGroupExcel.class);
+    }
+
+}
\ No newline at end of file
diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/IcFormItemOptionsController.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/IcFormItemOptionsController.java
new file mode 100644
index 0000000000..5d70a901d7
--- /dev/null
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/IcFormItemOptionsController.java
@@ -0,0 +1,94 @@
+/**
+ * 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.controller;
+
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.utils.ExcelUtils;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.validator.AssertUtils;
+import com.epmet.commons.tools.validator.ValidatorUtils;
+import com.epmet.commons.tools.validator.group.AddGroup;
+import com.epmet.commons.tools.validator.group.UpdateGroup;
+import com.epmet.commons.tools.validator.group.DefaultGroup;
+import com.epmet.dto.IcFormItemOptionsDTO;
+import com.epmet.excel.IcFormItemOptionsExcel;
+import com.epmet.service.IcFormItemOptionsService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * 表单项的选项
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-10-26
+ */
+@RestController
+@RequestMapping("icformitemoptions")
+public class IcFormItemOptionsController {
+    
+    @Autowired
+    private IcFormItemOptionsService icFormItemOptionsService;
+
+    @GetMapping("page")
+    public Result<PageData<IcFormItemOptionsDTO>> page(@RequestParam Map<String, Object> params){
+        PageData<IcFormItemOptionsDTO> page = icFormItemOptionsService.page(params);
+        return new Result<PageData<IcFormItemOptionsDTO>>().ok(page);
+    }
+
+    @GetMapping("{id}")
+    public Result<IcFormItemOptionsDTO> get(@PathVariable("id") String id){
+        IcFormItemOptionsDTO data = icFormItemOptionsService.get(id);
+        return new Result<IcFormItemOptionsDTO>().ok(data);
+    }
+
+    @PostMapping
+    public Result save(@RequestBody IcFormItemOptionsDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+        icFormItemOptionsService.save(dto);
+        return new Result();
+    }
+
+    @PutMapping
+    public Result update(@RequestBody IcFormItemOptionsDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+        icFormItemOptionsService.update(dto);
+        return new Result();
+    }
+
+    @DeleteMapping
+    public Result delete(@RequestBody String[] ids){
+        //效验数据
+        AssertUtils.isArrayEmpty(ids, "id");
+        icFormItemOptionsService.delete(ids);
+        return new Result();
+    }
+
+    @GetMapping("export")
+    public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
+        List<IcFormItemOptionsDTO> list = icFormItemOptionsService.list(params);
+        ExcelUtils.exportExcelToTarget(response, null, list, IcFormItemOptionsExcel.class);
+    }
+
+}
\ No newline at end of file
diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/ItemTypeController.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/ItemTypeController.java
new file mode 100644
index 0000000000..d5f5142c74
--- /dev/null
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/ItemTypeController.java
@@ -0,0 +1,94 @@
+/**
+ * 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.controller;
+
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.utils.ExcelUtils;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.validator.AssertUtils;
+import com.epmet.commons.tools.validator.ValidatorUtils;
+import com.epmet.commons.tools.validator.group.AddGroup;
+import com.epmet.commons.tools.validator.group.UpdateGroup;
+import com.epmet.commons.tools.validator.group.DefaultGroup;
+import com.epmet.dto.ItemTypeDTO;
+import com.epmet.excel.ItemTypeExcel;
+import com.epmet.service.ItemTypeService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * 控件类型
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-10-26
+ */
+@RestController
+@RequestMapping("itemtype")
+public class ItemTypeController {
+    
+    @Autowired
+    private ItemTypeService itemTypeService;
+
+    @GetMapping("page")
+    public Result<PageData<ItemTypeDTO>> page(@RequestParam Map<String, Object> params){
+        PageData<ItemTypeDTO> page = itemTypeService.page(params);
+        return new Result<PageData<ItemTypeDTO>>().ok(page);
+    }
+
+    @GetMapping("{id}")
+    public Result<ItemTypeDTO> get(@PathVariable("id") String id){
+        ItemTypeDTO data = itemTypeService.get(id);
+        return new Result<ItemTypeDTO>().ok(data);
+    }
+
+    @PostMapping
+    public Result save(@RequestBody ItemTypeDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+        itemTypeService.save(dto);
+        return new Result();
+    }
+
+    @PutMapping
+    public Result update(@RequestBody ItemTypeDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+        itemTypeService.update(dto);
+        return new Result();
+    }
+
+    @DeleteMapping
+    public Result delete(@RequestBody String[] ids){
+        //效验数据
+        AssertUtils.isArrayEmpty(ids, "id");
+        itemTypeService.delete(ids);
+        return new Result();
+    }
+
+    @GetMapping("export")
+    public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
+        List<ItemTypeDTO> list = itemTypeService.list(params);
+        ExcelUtils.exportExcelToTarget(response, null, list, ItemTypeExcel.class);
+    }
+
+}
\ No newline at end of file
diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/IcFormDao.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/IcFormDao.java
new file mode 100644
index 0000000000..fd40647a83
--- /dev/null
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/IcFormDao.java
@@ -0,0 +1,33 @@
+/**
+ * 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.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.entity.IcFormEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 配置表单
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-10-26
+ */
+@Mapper
+public interface IcFormDao extends BaseDao<IcFormEntity> {
+	
+}
\ No newline at end of file
diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/IcFormItemDao.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/IcFormItemDao.java
new file mode 100644
index 0000000000..44086df26f
--- /dev/null
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/IcFormItemDao.java
@@ -0,0 +1,33 @@
+/**
+ * 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.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.entity.IcFormItemEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 表单项
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-10-26
+ */
+@Mapper
+public interface IcFormItemDao extends BaseDao<IcFormItemEntity> {
+	
+}
\ No newline at end of file
diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/IcFormItemGroupDao.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/IcFormItemGroupDao.java
new file mode 100644
index 0000000000..d3b2322060
--- /dev/null
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/IcFormItemGroupDao.java
@@ -0,0 +1,33 @@
+/**
+ * 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.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.entity.IcFormItemGroupEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 表单项分组
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-10-26
+ */
+@Mapper
+public interface IcFormItemGroupDao extends BaseDao<IcFormItemGroupEntity> {
+	
+}
\ No newline at end of file
diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/IcFormItemOptionsDao.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/IcFormItemOptionsDao.java
new file mode 100644
index 0000000000..3609c41f9e
--- /dev/null
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/IcFormItemOptionsDao.java
@@ -0,0 +1,33 @@
+/**
+ * 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.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.entity.IcFormItemOptionsEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 表单项的选项
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-10-26
+ */
+@Mapper
+public interface IcFormItemOptionsDao extends BaseDao<IcFormItemOptionsEntity> {
+	
+}
\ No newline at end of file
diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/ItemTypeDao.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/ItemTypeDao.java
new file mode 100644
index 0000000000..ff4cb72d06
--- /dev/null
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/ItemTypeDao.java
@@ -0,0 +1,33 @@
+/**
+ * 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.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.entity.ItemTypeEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 控件类型
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-10-26
+ */
+@Mapper
+public interface ItemTypeDao extends BaseDao<ItemTypeEntity> {
+	
+}
\ No newline at end of file
diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/IcFormEntity.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/IcFormEntity.java
new file mode 100644
index 0000000000..4b53f0af6d
--- /dev/null
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/IcFormEntity.java
@@ -0,0 +1,61 @@
+/**
+ * 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.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * 配置表单
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-10-26
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("ic_form")
+public class IcFormEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 客户ID
+     */
+	private String customerId;
+
+    /**
+     * 表单CODE，从字典获取
+     */
+	private String formCode;
+
+    /**
+     * 表单名称
+     */
+	private String formName;
+
+    /**
+     * 地区码，有父级用父级
+     */
+	private String areaCode;
+
+}
diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/IcFormItemEntity.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/IcFormItemEntity.java
new file mode 100644
index 0000000000..78e0934311
--- /dev/null
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/IcFormItemEntity.java
@@ -0,0 +1,141 @@
+/**
+ * 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.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * 表单项
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-10-26
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("ic_form_item")
+public class IcFormItemEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 客户ID
+     */
+	private String customerId;
+
+    /**
+     * 
+     */
+	private String areaCode;
+
+    /**
+     * 表单ID
+     */
+	private String formId;
+
+    /**
+     * 表单CODE
+     */
+	private String formCode;
+
+    /**
+     * 父项ID
+     */
+	private String parentItemId;
+
+    /**
+     * 项标签
+     */
+	private String label;
+
+    /**
+     * 控件类型,EG:INPUT;从字典获取
+     */
+	private String itemType;
+
+    /**
+     * 分组ID,'默认，NONE'
+     */
+	private String itemGroupId;
+
+    /**
+     * 是否必填,1必填。0不必填
+     */
+	private Integer required;
+
+    /**
+     * 手机号：mobile; 身份证：id_card
+     */
+	private String validType;
+
+    /**
+     * 默认值
+     */
+	private String defaultValue;
+
+    /**
+     * 选项来源,REMOTE;LOCAL;如果是动态加载的下拉框或者CHECKBOX等的情况下使用。URL:接口获取(LABEL,VALUE)；JSON:直接从JSON中取
+     */
+	private String optionSourceType;
+
+    /**
+     * 来源地址,REMOTE才有，固定格式;如果OPTIONS_SOURCE是URL，则此处填写要调用的接口的URL相对路径，例如：/API/GOV/ORG/XXXX。此处不应设置参数，若需要参数应当完全由后端，通过TOKEN信息来获取
+     */
+	private String optionSourceValue;
+
+    /**
+     * 排序
+     */
+	private Integer sort;
+
+    /**
+     * 占位提示语
+     */
+	private String placeholder;
+
+    /**
+     * 是否查询显示,1展示。0不展示
+     */
+	private Integer searchDisplay;
+
+    /**
+     * 是否列表显示，1展示，0不展示
+     */
+	private Integer listDisplay;
+
+    /**
+     * 是否需要支持数据分析，1支持。0不支持
+     */
+	private Integer dataAnalyse;
+
+    /**
+     * 列名
+     */
+	private String columnName;
+
+    /**
+     * 列名序号，根据表递增
+     */
+	private Integer columnNum;
+
+}
diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/IcFormItemGroupEntity.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/IcFormItemGroupEntity.java
new file mode 100644
index 0000000000..240f086180
--- /dev/null
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/IcFormItemGroupEntity.java
@@ -0,0 +1,81 @@
+/**
+ * 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.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * 表单项分组
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-10-26
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("ic_form_item_group")
+public class IcFormItemGroupEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 客户ID
+     */
+	private String customerId;
+
+    /**
+     * 表单ID
+     */
+	private String formId;
+
+    /**
+     * 表单编码
+     */
+	private String formCode;
+
+    /**
+     * 对应的子表名称
+     */
+	private String tableName;
+
+    /**
+     * 是否支持添加一行，1支持，默认0不支持
+     */
+	private Integer supportAdd;
+
+    /**
+     * 名称
+     */
+	private String label;
+
+    /**
+     * 排序
+     */
+	private Integer sort;
+
+    /**
+     * 1展示，0不展示，默认1
+     */
+	private Integer display;
+
+}
diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/IcFormItemOptionsEntity.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/IcFormItemOptionsEntity.java
new file mode 100644
index 0000000000..1ef8d360db
--- /dev/null
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/IcFormItemOptionsEntity.java
@@ -0,0 +1,76 @@
+/**
+ * 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.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * 表单项的选项
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-10-26
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("ic_form_item_options")
+public class IcFormItemOptionsEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 客户ID
+     */
+	private String customerId;
+
+    /**
+     * 表单ID
+     */
+	private String formId;
+
+    /**
+     * 表单CODE
+     */
+	private String formCode;
+
+    /**
+     * 表单项ID
+     */
+	private String itemId;
+
+    /**
+     * 可选项标签名
+     */
+	private String optionLabel;
+
+    /**
+     * 标签value值
+     */
+	private String optionValue;
+
+    /**
+     * 排序
+     */
+	private Integer sort;
+
+}
diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/ItemTypeEntity.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/ItemTypeEntity.java
new file mode 100644
index 0000000000..8c552c2f75
--- /dev/null
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/ItemTypeEntity.java
@@ -0,0 +1,51 @@
+/**
+ * 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.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * 控件类型
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-10-26
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("item_type")
+public class ItemTypeEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 名称
+     */
+	private String name;
+
+    /**
+     * CODE
+     */
+	private String code;
+
+}
diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/excel/IcFormExcel.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/excel/IcFormExcel.java
new file mode 100644
index 0000000000..7f70adddfc
--- /dev/null
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/excel/IcFormExcel.java
@@ -0,0 +1,68 @@
+/**
+ * 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.excel;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 配置表单
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-10-26
+ */
+@Data
+public class IcFormExcel {
+
+    @Excel(name = "主键")
+    private String id;
+
+    @Excel(name = "客户ID")
+    private String customerId;
+
+    @Excel(name = "表单CODE，从字典获取")
+    private String formCode;
+
+    @Excel(name = "表单名称")
+    private String formName;
+
+    @Excel(name = "地区码，有父级用父级")
+    private String areaCode;
+
+    @Excel(name = "0未删除，1已删除")
+    private Integer delFlag;
+
+    @Excel(name = "乐观锁")
+    private Integer revision;
+
+    @Excel(name = "创建人")
+    private String createdBy;
+
+    @Excel(name = "创建时间")
+    private Date createdTime;
+
+    @Excel(name = "更新人")
+    private String updatedBy;
+
+    @Excel(name = "更新时间")
+    private Date updatedTime;
+
+
+}
\ No newline at end of file
diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/excel/IcFormItemExcel.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/excel/IcFormItemExcel.java
new file mode 100644
index 0000000000..8e11613a01
--- /dev/null
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/excel/IcFormItemExcel.java
@@ -0,0 +1,116 @@
+/**
+ * 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.excel;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 表单项
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-10-26
+ */
+@Data
+public class IcFormItemExcel {
+
+    @Excel(name = "主键")
+    private String id;
+
+    @Excel(name = "客户ID")
+    private String customerId;
+
+    @Excel(name = "")
+    private String areaCode;
+
+    @Excel(name = "表单ID")
+    private String formId;
+
+    @Excel(name = "表单CODE")
+    private String formCode;
+
+    @Excel(name = "父项ID")
+    private String parentItemId;
+
+    @Excel(name = "项标签")
+    private String label;
+
+    @Excel(name = "控件类型,EG:INPUT;从字典获取")
+    private String itemType;
+
+    @Excel(name = "分组ID,'默认，NONE'")
+    private String itemGroupId;
+
+    @Excel(name = "是否必填,1必填。0不必填")
+    private Integer required;
+
+    @Excel(name = "手机号：mobile; 身份证：id_card")
+    private String validType;
+
+    @Excel(name = "默认值")
+    private String defaultValue;
+
+    @Excel(name = "选项来源,REMOTE;LOCAL;如果是动态加载的下拉框或者CHECKBOX等的情况下使用。URL:接口获取(LABEL,VALUE)；JSON:直接从JSON中取")
+    private String optionSourceType;
+
+    @Excel(name = "来源地址,REMOTE才有，固定格式;如果OPTIONS_SOURCE是URL，则此处填写要调用的接口的URL相对路径，例如：/API/GOV/ORG/XXXX。此处不应设置参数，若需要参数应当完全由后端，通过TOKEN信息来获取")
+    private String optionSourceValue;
+
+    @Excel(name = "排序")
+    private Integer sort;
+
+    @Excel(name = "占位提示语")
+    private String placeholder;
+
+    @Excel(name = "是否查询显示,1展示。0不展示")
+    private Integer searchDisplay;
+
+    @Excel(name = "是否列表显示，1展示，0不展示")
+    private Integer listDisplay;
+
+    @Excel(name = "是否需要支持数据分析，1支持。0不支持")
+    private Integer dataAnalyse;
+
+    @Excel(name = "列名")
+    private String columnName;
+
+    @Excel(name = "列名序号，根据表递增")
+    private Integer columnNum;
+
+    @Excel(name = "0未删除，1已删除")
+    private Integer delFlag;
+
+    @Excel(name = "乐观锁")
+    private Integer revision;
+
+    @Excel(name = "创建人")
+    private String createdBy;
+
+    @Excel(name = "创建时间")
+    private Date createdTime;
+
+    @Excel(name = "更新人")
+    private String updatedBy;
+
+    @Excel(name = "更新时间")
+    private Date updatedTime;
+
+
+}
\ No newline at end of file
diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/excel/IcFormItemGroupExcel.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/excel/IcFormItemGroupExcel.java
new file mode 100644
index 0000000000..0d9cb8c7b9
--- /dev/null
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/excel/IcFormItemGroupExcel.java
@@ -0,0 +1,80 @@
+/**
+ * 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.excel;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 表单项分组
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-10-26
+ */
+@Data
+public class IcFormItemGroupExcel {
+
+    @Excel(name = "分组id")
+    private String id;
+
+    @Excel(name = "客户ID")
+    private String customerId;
+
+    @Excel(name = "表单ID")
+    private String formId;
+
+    @Excel(name = "表单编码")
+    private String formCode;
+
+    @Excel(name = "对应的子表名称")
+    private String tableName;
+
+    @Excel(name = "是否支持添加一行，1支持，默认0不支持")
+    private Integer supportAdd;
+
+    @Excel(name = "名称")
+    private String label;
+
+    @Excel(name = "排序")
+    private Integer sort;
+
+    @Excel(name = "1展示，0不展示，默认1")
+    private Integer display;
+
+    @Excel(name = "0未删除，1已删除")
+    private Integer delFlag;
+
+    @Excel(name = "乐观锁")
+    private Integer revision;
+
+    @Excel(name = "创建人")
+    private String createdBy;
+
+    @Excel(name = "创建时间")
+    private Date createdTime;
+
+    @Excel(name = "更新人")
+    private String updatedBy;
+
+    @Excel(name = "更新时间")
+    private Date updatedTime;
+
+
+}
\ No newline at end of file
diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/excel/IcFormItemOptionsExcel.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/excel/IcFormItemOptionsExcel.java
new file mode 100644
index 0000000000..3f039890dc
--- /dev/null
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/excel/IcFormItemOptionsExcel.java
@@ -0,0 +1,77 @@
+/**
+ * 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.excel;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 表单项的选项
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-10-26
+ */
+@Data
+public class IcFormItemOptionsExcel {
+
+    @Excel(name = "主键")
+    private String id;
+
+    @Excel(name = "客户ID")
+    private String customerId;
+
+    @Excel(name = "表单ID")
+    private String formId;
+
+    @Excel(name = "表单CODE")
+    private String formCode;
+
+    @Excel(name = "表单项ID")
+    private String itemId;
+
+    @Excel(name = "可选项标签名")
+    private String optionLabel;
+
+    @Excel(name = "标签value值")
+    private String optionValue;
+
+    @Excel(name = "排序")
+    private Integer sort;
+
+    @Excel(name = "0未删除，1已删除")
+    private Integer delFlag;
+
+    @Excel(name = "乐观锁")
+    private Integer revision;
+
+    @Excel(name = "创建人")
+    private String createdBy;
+
+    @Excel(name = "创建时间")
+    private Date createdTime;
+
+    @Excel(name = "更新人")
+    private String updatedBy;
+
+    @Excel(name = "更新时间")
+    private Date updatedTime;
+
+
+}
\ No newline at end of file
diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/excel/ItemTypeExcel.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/excel/ItemTypeExcel.java
new file mode 100644
index 0000000000..85db48a4c8
--- /dev/null
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/excel/ItemTypeExcel.java
@@ -0,0 +1,62 @@
+/**
+ * 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.excel;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 控件类型
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-10-26
+ */
+@Data
+public class ItemTypeExcel {
+
+    @Excel(name = "ID")
+    private String id;
+
+    @Excel(name = "名称")
+    private String name;
+
+    @Excel(name = "CODE")
+    private String code;
+
+    @Excel(name = "0未删除，1已删除")
+    private Integer delFlag;
+
+    @Excel(name = "乐观锁")
+    private Integer revision;
+
+    @Excel(name = "创建人")
+    private String createdBy;
+
+    @Excel(name = "创建时间")
+    private Date createdTime;
+
+    @Excel(name = "更新人")
+    private String updatedBy;
+
+    @Excel(name = "更新时间")
+    private Date updatedTime;
+
+
+}
\ No newline at end of file
diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/IcFormItemGroupService.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/IcFormItemGroupService.java
new file mode 100644
index 0000000000..79402d6273
--- /dev/null
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/IcFormItemGroupService.java
@@ -0,0 +1,95 @@
+/**
+ * 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;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.dto.IcFormItemGroupDTO;
+import com.epmet.entity.IcFormItemGroupEntity;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 表单项分组
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-10-26
+ */
+public interface IcFormItemGroupService extends BaseService<IcFormItemGroupEntity> {
+
+    /**
+     * 默认分页
+     *
+     * @param params
+     * @return PageData<IcFormItemGroupDTO>
+     * @author generator
+     * @date 2021-10-26
+     */
+    PageData<IcFormItemGroupDTO> page(Map<String, Object> params);
+
+    /**
+     * 默认查询
+     *
+     * @param params
+     * @return java.util.List<IcFormItemGroupDTO>
+     * @author generator
+     * @date 2021-10-26
+     */
+    List<IcFormItemGroupDTO> list(Map<String, Object> params);
+
+    /**
+     * 单条查询
+     *
+     * @param id
+     * @return IcFormItemGroupDTO
+     * @author generator
+     * @date 2021-10-26
+     */
+    IcFormItemGroupDTO get(String id);
+
+    /**
+     * 默认保存
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2021-10-26
+     */
+    void save(IcFormItemGroupDTO dto);
+
+    /**
+     * 默认更新
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2021-10-26
+     */
+    void update(IcFormItemGroupDTO dto);
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return void
+     * @author generator
+     * @date 2021-10-26
+     */
+    void delete(String[] ids);
+}
\ No newline at end of file
diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/IcFormItemOptionsService.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/IcFormItemOptionsService.java
new file mode 100644
index 0000000000..0ffe8fa5ea
--- /dev/null
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/IcFormItemOptionsService.java
@@ -0,0 +1,95 @@
+/**
+ * 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;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.dto.IcFormItemOptionsDTO;
+import com.epmet.entity.IcFormItemOptionsEntity;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 表单项的选项
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-10-26
+ */
+public interface IcFormItemOptionsService extends BaseService<IcFormItemOptionsEntity> {
+
+    /**
+     * 默认分页
+     *
+     * @param params
+     * @return PageData<IcFormItemOptionsDTO>
+     * @author generator
+     * @date 2021-10-26
+     */
+    PageData<IcFormItemOptionsDTO> page(Map<String, Object> params);
+
+    /**
+     * 默认查询
+     *
+     * @param params
+     * @return java.util.List<IcFormItemOptionsDTO>
+     * @author generator
+     * @date 2021-10-26
+     */
+    List<IcFormItemOptionsDTO> list(Map<String, Object> params);
+
+    /**
+     * 单条查询
+     *
+     * @param id
+     * @return IcFormItemOptionsDTO
+     * @author generator
+     * @date 2021-10-26
+     */
+    IcFormItemOptionsDTO get(String id);
+
+    /**
+     * 默认保存
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2021-10-26
+     */
+    void save(IcFormItemOptionsDTO dto);
+
+    /**
+     * 默认更新
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2021-10-26
+     */
+    void update(IcFormItemOptionsDTO dto);
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return void
+     * @author generator
+     * @date 2021-10-26
+     */
+    void delete(String[] ids);
+}
\ No newline at end of file
diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/IcFormItemService.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/IcFormItemService.java
new file mode 100644
index 0000000000..8a2aacd4bc
--- /dev/null
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/IcFormItemService.java
@@ -0,0 +1,95 @@
+/**
+ * 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;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.dto.IcFormItemDTO;
+import com.epmet.entity.IcFormItemEntity;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 表单项
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-10-26
+ */
+public interface IcFormItemService extends BaseService<IcFormItemEntity> {
+
+    /**
+     * 默认分页
+     *
+     * @param params
+     * @return PageData<IcFormItemDTO>
+     * @author generator
+     * @date 2021-10-26
+     */
+    PageData<IcFormItemDTO> page(Map<String, Object> params);
+
+    /**
+     * 默认查询
+     *
+     * @param params
+     * @return java.util.List<IcFormItemDTO>
+     * @author generator
+     * @date 2021-10-26
+     */
+    List<IcFormItemDTO> list(Map<String, Object> params);
+
+    /**
+     * 单条查询
+     *
+     * @param id
+     * @return IcFormItemDTO
+     * @author generator
+     * @date 2021-10-26
+     */
+    IcFormItemDTO get(String id);
+
+    /**
+     * 默认保存
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2021-10-26
+     */
+    void save(IcFormItemDTO dto);
+
+    /**
+     * 默认更新
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2021-10-26
+     */
+    void update(IcFormItemDTO dto);
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return void
+     * @author generator
+     * @date 2021-10-26
+     */
+    void delete(String[] ids);
+}
\ No newline at end of file
diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/IcFormService.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/IcFormService.java
new file mode 100644
index 0000000000..176624a10e
--- /dev/null
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/IcFormService.java
@@ -0,0 +1,95 @@
+/**
+ * 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;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.dto.IcFormDTO;
+import com.epmet.entity.IcFormEntity;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 配置表单
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-10-26
+ */
+public interface IcFormService extends BaseService<IcFormEntity> {
+
+    /**
+     * 默认分页
+     *
+     * @param params
+     * @return PageData<IcFormDTO>
+     * @author generator
+     * @date 2021-10-26
+     */
+    PageData<IcFormDTO> page(Map<String, Object> params);
+
+    /**
+     * 默认查询
+     *
+     * @param params
+     * @return java.util.List<IcFormDTO>
+     * @author generator
+     * @date 2021-10-26
+     */
+    List<IcFormDTO> list(Map<String, Object> params);
+
+    /**
+     * 单条查询
+     *
+     * @param id
+     * @return IcFormDTO
+     * @author generator
+     * @date 2021-10-26
+     */
+    IcFormDTO get(String id);
+
+    /**
+     * 默认保存
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2021-10-26
+     */
+    void save(IcFormDTO dto);
+
+    /**
+     * 默认更新
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2021-10-26
+     */
+    void update(IcFormDTO dto);
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return void
+     * @author generator
+     * @date 2021-10-26
+     */
+    void delete(String[] ids);
+}
\ No newline at end of file
diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/ItemTypeService.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/ItemTypeService.java
new file mode 100644
index 0000000000..27f16dc45d
--- /dev/null
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/ItemTypeService.java
@@ -0,0 +1,95 @@
+/**
+ * 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;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.dto.ItemTypeDTO;
+import com.epmet.entity.ItemTypeEntity;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 控件类型
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-10-26
+ */
+public interface ItemTypeService extends BaseService<ItemTypeEntity> {
+
+    /**
+     * 默认分页
+     *
+     * @param params
+     * @return PageData<ItemTypeDTO>
+     * @author generator
+     * @date 2021-10-26
+     */
+    PageData<ItemTypeDTO> page(Map<String, Object> params);
+
+    /**
+     * 默认查询
+     *
+     * @param params
+     * @return java.util.List<ItemTypeDTO>
+     * @author generator
+     * @date 2021-10-26
+     */
+    List<ItemTypeDTO> list(Map<String, Object> params);
+
+    /**
+     * 单条查询
+     *
+     * @param id
+     * @return ItemTypeDTO
+     * @author generator
+     * @date 2021-10-26
+     */
+    ItemTypeDTO get(String id);
+
+    /**
+     * 默认保存
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2021-10-26
+     */
+    void save(ItemTypeDTO dto);
+
+    /**
+     * 默认更新
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2021-10-26
+     */
+    void update(ItemTypeDTO dto);
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return void
+     * @author generator
+     * @date 2021-10-26
+     */
+    void delete(String[] ids);
+}
\ No newline at end of file
diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcFormItemGroupServiceImpl.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcFormItemGroupServiceImpl.java
new file mode 100644
index 0000000000..2de0adc908
--- /dev/null
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcFormItemGroupServiceImpl.java
@@ -0,0 +1,100 @@
+/**
+ * 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.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.dao.IcFormItemGroupDao;
+import com.epmet.dto.IcFormItemGroupDTO;
+import com.epmet.entity.IcFormItemGroupEntity;
+import com.epmet.service.IcFormItemGroupService;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 表单项分组
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-10-26
+ */
+@Service
+public class IcFormItemGroupServiceImpl extends BaseServiceImpl<IcFormItemGroupDao, IcFormItemGroupEntity> implements IcFormItemGroupService {
+
+
+    @Override
+    public PageData<IcFormItemGroupDTO> page(Map<String, Object> params) {
+        IPage<IcFormItemGroupEntity> page = baseDao.selectPage(
+                getPage(params, FieldConstant.CREATED_TIME, false),
+                getWrapper(params)
+        );
+        return getPageData(page, IcFormItemGroupDTO.class);
+    }
+
+    @Override
+    public List<IcFormItemGroupDTO> list(Map<String, Object> params) {
+        List<IcFormItemGroupEntity> entityList = baseDao.selectList(getWrapper(params));
+
+        return ConvertUtils.sourceToTarget(entityList, IcFormItemGroupDTO.class);
+    }
+
+    private QueryWrapper<IcFormItemGroupEntity> getWrapper(Map<String, Object> params){
+        String id = (String)params.get(FieldConstant.ID_HUMP);
+
+        QueryWrapper<IcFormItemGroupEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
+
+        return wrapper;
+    }
+
+    @Override
+    public IcFormItemGroupDTO get(String id) {
+        IcFormItemGroupEntity entity = baseDao.selectById(id);
+        return ConvertUtils.sourceToTarget(entity, IcFormItemGroupDTO.class);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void save(IcFormItemGroupDTO dto) {
+        IcFormItemGroupEntity entity = ConvertUtils.sourceToTarget(dto, IcFormItemGroupEntity.class);
+        insert(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void update(IcFormItemGroupDTO dto) {
+        IcFormItemGroupEntity entity = ConvertUtils.sourceToTarget(dto, IcFormItemGroupEntity.class);
+        updateById(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void delete(String[] ids) {
+        // 逻辑删除（@TableLogic 注解）
+        baseDao.deleteBatchIds(Arrays.asList(ids));
+    }
+
+}
\ No newline at end of file
diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcFormItemOptionsServiceImpl.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcFormItemOptionsServiceImpl.java
new file mode 100644
index 0000000000..c7ed24cd3d
--- /dev/null
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcFormItemOptionsServiceImpl.java
@@ -0,0 +1,100 @@
+/**
+ * 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.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.dao.IcFormItemOptionsDao;
+import com.epmet.dto.IcFormItemOptionsDTO;
+import com.epmet.entity.IcFormItemOptionsEntity;
+import com.epmet.service.IcFormItemOptionsService;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 表单项的选项
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-10-26
+ */
+@Service
+public class IcFormItemOptionsServiceImpl extends BaseServiceImpl<IcFormItemOptionsDao, IcFormItemOptionsEntity> implements IcFormItemOptionsService {
+
+
+    @Override
+    public PageData<IcFormItemOptionsDTO> page(Map<String, Object> params) {
+        IPage<IcFormItemOptionsEntity> page = baseDao.selectPage(
+                getPage(params, FieldConstant.CREATED_TIME, false),
+                getWrapper(params)
+        );
+        return getPageData(page, IcFormItemOptionsDTO.class);
+    }
+
+    @Override
+    public List<IcFormItemOptionsDTO> list(Map<String, Object> params) {
+        List<IcFormItemOptionsEntity> entityList = baseDao.selectList(getWrapper(params));
+
+        return ConvertUtils.sourceToTarget(entityList, IcFormItemOptionsDTO.class);
+    }
+
+    private QueryWrapper<IcFormItemOptionsEntity> getWrapper(Map<String, Object> params){
+        String id = (String)params.get(FieldConstant.ID_HUMP);
+
+        QueryWrapper<IcFormItemOptionsEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
+
+        return wrapper;
+    }
+
+    @Override
+    public IcFormItemOptionsDTO get(String id) {
+        IcFormItemOptionsEntity entity = baseDao.selectById(id);
+        return ConvertUtils.sourceToTarget(entity, IcFormItemOptionsDTO.class);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void save(IcFormItemOptionsDTO dto) {
+        IcFormItemOptionsEntity entity = ConvertUtils.sourceToTarget(dto, IcFormItemOptionsEntity.class);
+        insert(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void update(IcFormItemOptionsDTO dto) {
+        IcFormItemOptionsEntity entity = ConvertUtils.sourceToTarget(dto, IcFormItemOptionsEntity.class);
+        updateById(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void delete(String[] ids) {
+        // 逻辑删除（@TableLogic 注解）
+        baseDao.deleteBatchIds(Arrays.asList(ids));
+    }
+
+}
\ No newline at end of file
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
new file mode 100644
index 0000000000..2c312272af
--- /dev/null
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcFormItemServiceImpl.java
@@ -0,0 +1,100 @@
+/**
+ * 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.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.dao.IcFormItemDao;
+import com.epmet.dto.IcFormItemDTO;
+import com.epmet.entity.IcFormItemEntity;
+import com.epmet.service.IcFormItemService;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 表单项
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-10-26
+ */
+@Service
+public class IcFormItemServiceImpl extends BaseServiceImpl<IcFormItemDao, IcFormItemEntity> implements IcFormItemService {
+
+
+    @Override
+    public PageData<IcFormItemDTO> page(Map<String, Object> params) {
+        IPage<IcFormItemEntity> page = baseDao.selectPage(
+                getPage(params, FieldConstant.CREATED_TIME, false),
+                getWrapper(params)
+        );
+        return getPageData(page, IcFormItemDTO.class);
+    }
+
+    @Override
+    public List<IcFormItemDTO> list(Map<String, Object> params) {
+        List<IcFormItemEntity> entityList = baseDao.selectList(getWrapper(params));
+
+        return ConvertUtils.sourceToTarget(entityList, IcFormItemDTO.class);
+    }
+
+    private QueryWrapper<IcFormItemEntity> getWrapper(Map<String, Object> params){
+        String id = (String)params.get(FieldConstant.ID_HUMP);
+
+        QueryWrapper<IcFormItemEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
+
+        return wrapper;
+    }
+
+    @Override
+    public IcFormItemDTO get(String id) {
+        IcFormItemEntity entity = baseDao.selectById(id);
+        return ConvertUtils.sourceToTarget(entity, IcFormItemDTO.class);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void save(IcFormItemDTO dto) {
+        IcFormItemEntity entity = ConvertUtils.sourceToTarget(dto, IcFormItemEntity.class);
+        insert(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void update(IcFormItemDTO dto) {
+        IcFormItemEntity entity = ConvertUtils.sourceToTarget(dto, IcFormItemEntity.class);
+        updateById(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void delete(String[] ids) {
+        // 逻辑删除（@TableLogic 注解）
+        baseDao.deleteBatchIds(Arrays.asList(ids));
+    }
+
+}
\ No newline at end of file
diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcFormServiceImpl.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcFormServiceImpl.java
new file mode 100644
index 0000000000..e9691a9151
--- /dev/null
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcFormServiceImpl.java
@@ -0,0 +1,100 @@
+/**
+ * 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.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.dao.IcFormDao;
+import com.epmet.dto.IcFormDTO;
+import com.epmet.entity.IcFormEntity;
+import com.epmet.service.IcFormService;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 配置表单
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-10-26
+ */
+@Service
+public class IcFormServiceImpl extends BaseServiceImpl<IcFormDao, IcFormEntity> implements IcFormService {
+
+
+    @Override
+    public PageData<IcFormDTO> page(Map<String, Object> params) {
+        IPage<IcFormEntity> page = baseDao.selectPage(
+                getPage(params, FieldConstant.CREATED_TIME, false),
+                getWrapper(params)
+        );
+        return getPageData(page, IcFormDTO.class);
+    }
+
+    @Override
+    public List<IcFormDTO> list(Map<String, Object> params) {
+        List<IcFormEntity> entityList = baseDao.selectList(getWrapper(params));
+
+        return ConvertUtils.sourceToTarget(entityList, IcFormDTO.class);
+    }
+
+    private QueryWrapper<IcFormEntity> getWrapper(Map<String, Object> params){
+        String id = (String)params.get(FieldConstant.ID_HUMP);
+
+        QueryWrapper<IcFormEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
+
+        return wrapper;
+    }
+
+    @Override
+    public IcFormDTO get(String id) {
+        IcFormEntity entity = baseDao.selectById(id);
+        return ConvertUtils.sourceToTarget(entity, IcFormDTO.class);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void save(IcFormDTO dto) {
+        IcFormEntity entity = ConvertUtils.sourceToTarget(dto, IcFormEntity.class);
+        insert(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void update(IcFormDTO dto) {
+        IcFormEntity entity = ConvertUtils.sourceToTarget(dto, IcFormEntity.class);
+        updateById(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void delete(String[] ids) {
+        // 逻辑删除（@TableLogic 注解）
+        baseDao.deleteBatchIds(Arrays.asList(ids));
+    }
+
+}
\ No newline at end of file
diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/ItemTypeServiceImpl.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/ItemTypeServiceImpl.java
new file mode 100644
index 0000000000..cb73a5b85c
--- /dev/null
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/ItemTypeServiceImpl.java
@@ -0,0 +1,100 @@
+/**
+ * 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.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.dao.ItemTypeDao;
+import com.epmet.dto.ItemTypeDTO;
+import com.epmet.entity.ItemTypeEntity;
+import com.epmet.service.ItemTypeService;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 控件类型
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-10-26
+ */
+@Service
+public class ItemTypeServiceImpl extends BaseServiceImpl<ItemTypeDao, ItemTypeEntity> implements ItemTypeService {
+
+
+    @Override
+    public PageData<ItemTypeDTO> page(Map<String, Object> params) {
+        IPage<ItemTypeEntity> page = baseDao.selectPage(
+                getPage(params, FieldConstant.CREATED_TIME, false),
+                getWrapper(params)
+        );
+        return getPageData(page, ItemTypeDTO.class);
+    }
+
+    @Override
+    public List<ItemTypeDTO> list(Map<String, Object> params) {
+        List<ItemTypeEntity> entityList = baseDao.selectList(getWrapper(params));
+
+        return ConvertUtils.sourceToTarget(entityList, ItemTypeDTO.class);
+    }
+
+    private QueryWrapper<ItemTypeEntity> getWrapper(Map<String, Object> params){
+        String id = (String)params.get(FieldConstant.ID_HUMP);
+
+        QueryWrapper<ItemTypeEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
+
+        return wrapper;
+    }
+
+    @Override
+    public ItemTypeDTO get(String id) {
+        ItemTypeEntity entity = baseDao.selectById(id);
+        return ConvertUtils.sourceToTarget(entity, ItemTypeDTO.class);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void save(ItemTypeDTO dto) {
+        ItemTypeEntity entity = ConvertUtils.sourceToTarget(dto, ItemTypeEntity.class);
+        insert(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void update(ItemTypeDTO dto) {
+        ItemTypeEntity entity = ConvertUtils.sourceToTarget(dto, ItemTypeEntity.class);
+        updateById(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void delete(String[] ids) {
+        // 逻辑删除（@TableLogic 注解）
+        baseDao.deleteBatchIds(Arrays.asList(ids));
+    }
+
+}
\ No newline at end of file
diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcFormDao.xml b/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcFormDao.xml
new file mode 100644
index 0000000000..8b0bb1f336
--- /dev/null
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcFormDao.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.epmet.dao.IcFormDao">
+
+
+</mapper>
\ No newline at end of file
diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcFormItemDao.xml b/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcFormItemDao.xml
new file mode 100644
index 0000000000..0bb11f58bf
--- /dev/null
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcFormItemDao.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.epmet.dao.IcFormItemDao">
+
+
+
+</mapper>
\ No newline at end of file
diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcFormItemGroupDao.xml b/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcFormItemGroupDao.xml
new file mode 100644
index 0000000000..ea697d8682
--- /dev/null
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcFormItemGroupDao.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.epmet.dao.IcFormItemGroupDao">
+
+
+
+</mapper>
\ No newline at end of file
diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcFormItemOptionsDao.xml b/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcFormItemOptionsDao.xml
new file mode 100644
index 0000000000..910d1f833f
--- /dev/null
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcFormItemOptionsDao.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.epmet.dao.IcFormItemOptionsDao">
+
+
+
+</mapper>
\ No newline at end of file
diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/ItemTypeDao.xml b/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/ItemTypeDao.xml
new file mode 100644
index 0000000000..d488c4feab
--- /dev/null
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/ItemTypeDao.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.epmet.dao.ItemTypeDao">
+
+
+
+</mapper>
\ No newline at end of file
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcEnsureHouseDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcEnsureHouseDTO.java
new file mode 100644
index 0000000000..0868f00f51
--- /dev/null
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcEnsureHouseDTO.java
@@ -0,0 +1,131 @@
+/**
+ * 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.dto;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ * 保障房
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-10-26
+ */
+@Data
+public class IcEnsureHouseDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 唯一标识
+     */
+	private String id;
+
+    /**
+     * 客户Id customer.id
+     */
+	private String customerId;
+
+    /**
+     * 主表Id
+     */
+	private String icResiUser;
+
+    /**
+     * 住房性质【字典表】
+     */
+	private String zfxz;
+
+    /**
+     * 保障类型
+     */
+	private String bzlx;
+
+    /**
+     * 发证日期
+     */
+	private Date fzrq;
+
+    /**
+     * 补贴编号
+     */
+	private String btbh;
+
+    /**
+     * 补贴金额
+     */
+	private String btje;
+
+    /**
+     * 删除标识 0.未删除 1.已删除
+     */
+	private Integer delFlag;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+    /**
+     * 预留字段1
+     */
+	private String field1;
+
+    /**
+     * 预留字段2
+     */
+	private String field2;
+
+    /**
+     * 预留字段3
+     */
+	private String field3;
+
+    /**
+     * 预留字段4
+     */
+	private String field4;
+
+    /**
+     * 预留字段5
+     */
+	private String field5;
+
+}
\ No newline at end of file
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcOldPeopleDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcOldPeopleDTO.java
new file mode 100644
index 0000000000..789e5ff1da
--- /dev/null
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcOldPeopleDTO.java
@@ -0,0 +1,111 @@
+/**
+ * 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.dto;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ * 老年人
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-10-26
+ */
+@Data
+public class IcOldPeopleDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 唯一标识
+     */
+	private String id;
+
+    /**
+     * 客户Id customer.id
+     */
+	private String customerId;
+
+    /**
+     * 主表Id
+     */
+	private String icResiUser;
+
+    /**
+     * 高龄补助
+     */
+	private String glbz;
+
+    /**
+     * 删除标识 0.未删除 1.已删除
+     */
+	private Integer delFlag;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+    /**
+     * 预留字段1
+     */
+	private String field1;
+
+    /**
+     * 预留字段2
+     */
+	private String field2;
+
+    /**
+     * 预留字段3
+     */
+	private String field3;
+
+    /**
+     * 预留字段4
+     */
+	private String field4;
+
+    /**
+     * 预留字段5
+     */
+	private String field5;
+
+}
\ No newline at end of file
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcPartyMemberDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcPartyMemberDTO.java
new file mode 100644
index 0000000000..7dd3198144
--- /dev/null
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcPartyMemberDTO.java
@@ -0,0 +1,146 @@
+/**
+ * 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.dto;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ * 党员
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-10-26
+ */
+@Data
+public class IcPartyMemberDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 唯一标识
+     */
+	private String id;
+
+    /**
+     * 客户Id customer.id
+     */
+	private String customerId;
+
+    /**
+     * 主表Id
+     */
+	private String icResiUser;
+
+    /**
+     * 入党时间
+     */
+	private Date rdsj;
+
+    /**
+     * 转正时间
+     */
+	private Date zzsj;
+
+    /**
+     * 所属支部
+     */
+	private String sszb;
+
+    /**
+     * 是否流动党员
+     */
+	private String isLd;
+
+    /**
+     * 流动党员活动证号
+     */
+	private String ldzh;
+
+    /**
+     * 职务
+     */
+	private String partyZw;
+
+    /**
+     * 是否退休
+     */
+	private String isTx;
+
+    /**
+     * 是否党员中心户
+     */
+	private String isDyzxh;
+
+    /**
+     * 删除标识 0.未删除 1.已删除
+     */
+	private Integer delFlag;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+    /**
+     * 预留字段1
+     */
+	private String field1;
+
+    /**
+     * 预留字段2
+     */
+	private String field2;
+
+    /**
+     * 预留字段3
+     */
+	private String field3;
+
+    /**
+     * 预留字段4
+     */
+	private String field4;
+
+    /**
+     * 预留字段5
+     */
+	private String field5;
+
+}
\ No newline at end of file
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcResiDemandDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcResiDemandDTO.java
new file mode 100644
index 0000000000..c0d6370588
--- /dev/null
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcResiDemandDTO.java
@@ -0,0 +1,131 @@
+/**
+ * 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.dto;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ * 居民需求
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-10-26
+ */
+@Data
+public class IcResiDemandDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 唯一标识
+     */
+	private String id;
+
+    /**
+     * 客户Id customer.id
+     */
+	private String customerId;
+
+    /**
+     * 主表Id
+     */
+	private String icResiUser;
+
+    /**
+     * 大类Id
+     */
+	private Date bigClass;
+
+    /**
+     * 大类名称
+     */
+	private Date bigClassName;
+
+    /**
+     * 小类Id
+     */
+	private String smallClass;
+
+    /**
+     * 小类名称
+     */
+	private String smallClassName;
+
+    /**
+     * 描述
+     */
+	private String remakes;
+
+    /**
+     * 删除标识 0.未删除 1.已删除
+     */
+	private Integer delFlag;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+    /**
+     * 预留字段1
+     */
+	private String field1;
+
+    /**
+     * 预留字段2
+     */
+	private String field2;
+
+    /**
+     * 预留字段3
+     */
+	private String field3;
+
+    /**
+     * 预留字段4
+     */
+	private String field4;
+
+    /**
+     * 预留字段5
+     */
+	private String field5;
+
+}
\ No newline at end of file
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcResiUserDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcResiUserDTO.java
new file mode 100644
index 0000000000..6a57281d10
--- /dev/null
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcResiUserDTO.java
@@ -0,0 +1,526 @@
+/**
+ * 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.dto;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ * 用户基础信息
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-10-26
+ */
+@Data
+public class IcResiUserDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+	private String id;
+
+    /**
+     * 客户Id customer.id
+     */
+	private String customerId;
+
+    /**
+     * 
+     */
+	private String agencyId;
+
+    /**
+     * 
+     */
+	private String pids;
+
+    /**
+     * 网格ID
+     */
+	private String gridId;
+
+    /**
+     * 所属小区ID
+     */
+	private String villageId;
+
+    /**
+     * 所属楼宇Id
+     */
+	private String buildId;
+
+    /**
+     * 所属家庭Id
+     */
+	private String homeId;
+
+    /**
+     * 是否本地户籍
+     */
+	private String isBdhj;
+
+    /**
+     * 姓名
+     */
+	private String name;
+
+    /**
+     * 手机号
+     */
+	private String mobile;
+
+    /**
+     * 性别
+     */
+	private String gender;
+
+    /**
+     * 身份证号
+     */
+	private String idCard;
+
+    /**
+     * 出生日期
+     */
+	private String birthday;
+
+    /**
+     * 备注
+     */
+	private String remarks;
+
+    /**
+     * 联系人
+     */
+	private String contacts;
+
+    /**
+     * 联系人电话
+     */
+	private String contactsMobile;
+
+    /**
+     * 九小场所url
+     */
+	private String ninePlace;
+
+    /**
+     * 是否党员
+     */
+	private String isParty;
+
+    /**
+     * 是否低保户
+     */
+	private String isDbh;
+
+    /**
+     * 是否保障房
+     */
+	private String isEnsureHouse;
+
+    /**
+     * 是否失业
+     */
+	private String isUnemployed;
+
+    /**
+     * 是否育龄妇女
+     */
+	private String isYlfn;
+
+    /**
+     * 是否退役军人
+     */
+	private String isVeterans;
+
+    /**
+     * 是否统战人员
+     */
+	private String isUnitedFront;
+
+    /**
+     * 是否信访人员
+     */
+	private String isXfry;
+
+    /**
+     * 是否志愿者
+     */
+	private String isVolunteer;
+
+    /**
+     * 是否老年人
+     */
+	private String isOldPeople;
+
+    /**
+     * 是否空巢
+     */
+	private String isKc;
+
+    /**
+     * 是否失独
+     */
+	private String isSd;
+
+    /**
+     * 是否失能
+     */
+	private String isSn;
+
+    /**
+     * 是否失智
+     */
+	private String isSz;
+
+    /**
+     * 是否残疾
+     */
+	private String isCj;
+
+    /**
+     * 是否大病
+     */
+	private String isDb;
+
+    /**
+     * 是否慢病
+     */
+	private String isMb;
+
+    /**
+     * 是否特殊人群
+     */
+	private String isSpecial;
+
+    /**
+     * 文化程度【字典表】
+     */
+	private String culture;
+
+    /**
+     * 文化程度备注
+     */
+	private String cultureRemakes;
+
+    /**
+     * 特长【字典表】
+     */
+	private String specialSkill;
+
+    /**
+     * 兴趣爱好
+     */
+	private String hobby;
+
+    /**
+     * 兴趣爱好备注
+     */
+	private String hobbyRemakes;
+
+    /**
+     * 宗教信仰
+     */
+	private String faith;
+
+    /**
+     * 宗教信仰备注
+     */
+	private String faithRemakes;
+
+    /**
+     * 残疾类别【字典表】
+     */
+	private String cjlb;
+
+    /**
+     * 残疾登记(状况)【字典表】
+     */
+	private String cjzk;
+
+    /**
+     * 残疾证号
+     */
+	private String cjzh;
+
+    /**
+     * 残疾说明
+     */
+	private String cjsm;
+
+    /**
+     * 有无监护人【yes no】
+     */
+	private String ynJdr;
+
+    /**
+     * 有无技能特长【yes no】
+     */
+	private String ynJntc;
+
+    /**
+     * 有无劳动能力
+     */
+	private String ynLdnl;
+
+    /**
+     * 有无非义务教育阶段助学【yes no】
+     */
+	private String ynFywjyjdzx;
+
+    /**
+     * 所患大病
+     */
+	private String shdb;
+
+    /**
+     * 患大病时间
+     */
+	private Date dbsj;
+
+    /**
+     * 所患慢性病
+     */
+	private String shmxb;
+
+    /**
+     * 患慢性病时间
+     */
+	private Date mxbsj;
+
+    /**
+     * 是否参保
+     */
+	private String isCb;
+
+    /**
+     * 自付金额
+     */
+	private String zfje;
+
+    /**
+     * 救助金额
+     */
+	private String jzje;
+
+    /**
+     * 救助时间[yyyy-MM-dd]
+     */
+	private Date jzsj;
+
+    /**
+     * 享受救助明细序号
+     */
+	private String jzmxxh;
+
+    /**
+     * 健康信息备注
+     */
+	private String healthRemakes;
+
+    /**
+     * 工作单位
+     */
+	private String gzdw;
+
+    /**
+     * 职业
+     */
+	private String zy;
+
+    /**
+     * 离退休时间
+     */
+	private Date ltxsj;
+
+    /**
+     * 工作信息备注
+     */
+	private String workRemake;
+
+    /**
+     * 退休金额
+     */
+	private String txje;
+
+    /**
+     * 月收入
+     */
+	private String ysr;
+
+    /**
+     * 是否经济低保
+     */
+	private String isJjdb;
+
+    /**
+     * 籍贯
+     */
+	private String jg;
+
+    /**
+     * 户籍所在地
+     */
+	private String hjszd;
+
+    /**
+     * 现居住地
+     */
+	private String xjzd;
+
+    /**
+     * 人户情况
+     */
+	private String rhzk;
+
+    /**
+     * 居住信息备注
+     */
+	private String jzxxRemakes;
+
+    /**
+     * 民族【字典表】
+     */
+	private String mz;
+
+    /**
+     * 与户主关系【字典表】
+     */
+	private String yhzgx;
+
+    /**
+     * 居住情况【字典表】
+     */
+	private String jzqk;
+
+    /**
+     * 婚姻状况【字典表】
+     */
+	private String hyzk;
+
+    /**
+     * 配偶情况【字典表】
+     */
+	private String poqk;
+
+    /**
+     * 有无赡养人
+     */
+	private String ynSyr;
+
+    /**
+     * 与赡养人关系【字典表】
+     */
+	private String ysyrgx;
+
+    /**
+     * 赡养人电话
+     */
+	private String syrMobile;
+
+    /**
+     * 家庭信息备注
+     */
+	private String jtxxRemakes;
+
+    /**
+     * 删除标识 0.未删除 1.已删除
+     */
+	private Integer delFlag;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+    /**
+     * 预留字段1
+     */
+	private String field1;
+
+    /**
+     * 预留字段2
+     */
+	private String field2;
+
+    /**
+     * 预留字段3
+     */
+	private String field3;
+
+    /**
+     * 预留字段4
+     */
+	private String field4;
+
+    /**
+     * 预留字段5
+     */
+	private String field5;
+
+    /**
+     * 预留字段6
+     */
+	private String field6;
+
+    /**
+     * 预留字段7
+     */
+	private String field7;
+
+    /**
+     * 预留字段8
+     */
+	private String field8;
+
+    /**
+     * 预留字段9
+     */
+	private String field9;
+
+    /**
+     * 预留字段10
+     */
+	private String field10;
+
+}
\ No newline at end of file
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcSpecialDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcSpecialDTO.java
new file mode 100644
index 0000000000..bc9458b2d0
--- /dev/null
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcSpecialDTO.java
@@ -0,0 +1,111 @@
+/**
+ * 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.dto;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ * 特殊人群
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-10-26
+ */
+@Data
+public class IcSpecialDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 唯一标识
+     */
+	private String id;
+
+    /**
+     * 客户Id customer.id
+     */
+	private String customerId;
+
+    /**
+     * 主表Id
+     */
+	private String icResiUser;
+
+    /**
+     * 人群类别【字典表】
+     */
+	private String specialRqlb;
+
+    /**
+     * 删除标识 0.未删除 1.已删除
+     */
+	private Integer delFlag;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+    /**
+     * 预留字段1
+     */
+	private String field1;
+
+    /**
+     * 预留字段2
+     */
+	private String field2;
+
+    /**
+     * 预留字段3
+     */
+	private String field3;
+
+    /**
+     * 预留字段4
+     */
+	private String field4;
+
+    /**
+     * 预留字段5
+     */
+	private String field5;
+
+}
\ No newline at end of file
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcUnemployedDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcUnemployedDTO.java
new file mode 100644
index 0000000000..930d40c706
--- /dev/null
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcUnemployedDTO.java
@@ -0,0 +1,151 @@
+/**
+ * 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.dto;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ * 失业人员
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-10-26
+ */
+@Data
+public class IcUnemployedDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 唯一标识
+     */
+	private String id;
+
+    /**
+     * 客户Id customer.id
+     */
+	private String customerId;
+
+    /**
+     * 主表Id
+     */
+	private String icResiUser;
+
+    /**
+     * 原工作单位
+     */
+	private String ygzdw;
+
+    /**
+     * 失业人员类别【字典表】
+     */
+	private String syrylb;
+
+    /**
+     * 失业时间
+     */
+	private Date sysj;
+
+    /**
+     * 失业证号
+     */
+	private String syzh;
+
+    /**
+     * 再就业优惠证号
+     */
+	private String zjyyhzh;
+
+    /**
+     * 技术特长
+     */
+	private String jstc;
+
+    /**
+     * 失业原因【字典表】
+     */
+	private String syyy;
+
+    /**
+     * 是否就业困难对象
+     */
+	private String isJykndx;
+
+    /**
+     * 劳动能力就业愿望
+     */
+	private String jyyw;
+
+    /**
+     * 删除标识 0.未删除 1.已删除
+     */
+	private Integer delFlag;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+    /**
+     * 预留字段1
+     */
+	private String field1;
+
+    /**
+     * 预留字段2
+     */
+	private String field2;
+
+    /**
+     * 预留字段3
+     */
+	private String field3;
+
+    /**
+     * 预留字段4
+     */
+	private String field4;
+
+    /**
+     * 预留字段5
+     */
+	private String field5;
+
+}
\ No newline at end of file
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcUnitedFrontDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcUnitedFrontDTO.java
new file mode 100644
index 0000000000..c6be71bc6c
--- /dev/null
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcUnitedFrontDTO.java
@@ -0,0 +1,116 @@
+/**
+ * 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.dto;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ * 统战人员
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-10-26
+ */
+@Data
+public class IcUnitedFrontDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 唯一标识
+     */
+	private String id;
+
+    /**
+     * 客户Id customer.id
+     */
+	private String customerId;
+
+    /**
+     * 主表Id
+     */
+	private String icResiUser;
+
+    /**
+     * 职务职业
+     */
+	private String zwzy;
+
+    /**
+     * 探亲情况
+     */
+	private String tqqk;
+
+    /**
+     * 删除标识 0.未删除 1.已删除
+     */
+	private Integer delFlag;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+    /**
+     * 预留字段1
+     */
+	private String field1;
+
+    /**
+     * 预留字段2
+     */
+	private String field2;
+
+    /**
+     * 预留字段3
+     */
+	private String field3;
+
+    /**
+     * 预留字段4
+     */
+	private String field4;
+
+    /**
+     * 预留字段5
+     */
+	private String field5;
+
+}
\ No newline at end of file
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcVeteransDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcVeteransDTO.java
new file mode 100644
index 0000000000..9a0c6399aa
--- /dev/null
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcVeteransDTO.java
@@ -0,0 +1,146 @@
+/**
+ * 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.dto;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ * 退役军人
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-10-26
+ */
+@Data
+public class IcVeteransDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 唯一标识
+     */
+	private String id;
+
+    /**
+     * 客户Id customer.id
+     */
+	private String customerId;
+
+    /**
+     * 主表Id
+     */
+	private String icResiUser;
+
+    /**
+     * 入伍时间
+     */
+	private Date rwsj;
+
+    /**
+     * 退伍时间
+     */
+	private Date twsj;
+
+    /**
+     * 服役单位
+     */
+	private String fydw;
+
+    /**
+     * 接收单位
+     */
+	private String jsdw;
+
+    /**
+     * 待安置补助金
+     */
+	private String dazbzj;
+
+    /**
+     * 培训状况
+     */
+	private String pxzk;
+
+    /**
+     * 参战时间【年月日区间值yyyy-MM-dd~yyyy-MM-dd】
+     */
+	private Date czsj;
+
+    /**
+     * 现就业情况
+     */
+	private String xjyqk;
+
+    /**
+     * 删除标识 0.未删除 1.已删除
+     */
+	private Integer delFlag;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+    /**
+     * 预留字段1
+     */
+	private String field1;
+
+    /**
+     * 预留字段2
+     */
+	private String field2;
+
+    /**
+     * 预留字段3
+     */
+	private String field3;
+
+    /**
+     * 预留字段4
+     */
+	private String field4;
+
+    /**
+     * 预留字段5
+     */
+	private String field5;
+
+}
\ No newline at end of file
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcVolunteerDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcVolunteerDTO.java
new file mode 100644
index 0000000000..4a49527d42
--- /dev/null
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcVolunteerDTO.java
@@ -0,0 +1,116 @@
+/**
+ * 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.dto;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ * 志愿者
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-10-26
+ */
+@Data
+public class IcVolunteerDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 唯一标识
+     */
+	private String id;
+
+    /**
+     * 客户Id customer.id
+     */
+	private String customerId;
+
+    /**
+     * 主表Id
+     */
+	private String icResiUser;
+
+    /**
+     * 类别【字典表】
+     */
+	private String volunteerCategory;
+
+    /**
+     * 备注
+     */
+	private String volunteerRemark;
+
+    /**
+     * 删除标识 0.未删除 1.已删除
+     */
+	private Integer delFlag;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+    /**
+     * 预留字段1
+     */
+	private String field1;
+
+    /**
+     * 预留字段2
+     */
+	private String field2;
+
+    /**
+     * 预留字段3
+     */
+	private String field3;
+
+    /**
+     * 预留字段4
+     */
+	private String field4;
+
+    /**
+     * 预留字段5
+     */
+	private String field5;
+
+}
\ No newline at end of file
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java
new file mode 100644
index 0000000000..37d3bde4d5
--- /dev/null
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java
@@ -0,0 +1,94 @@
+/**
+ * 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.controller;
+
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.utils.ExcelUtils;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.validator.AssertUtils;
+import com.epmet.commons.tools.validator.ValidatorUtils;
+import com.epmet.commons.tools.validator.group.AddGroup;
+import com.epmet.commons.tools.validator.group.UpdateGroup;
+import com.epmet.commons.tools.validator.group.DefaultGroup;
+import com.epmet.dto.IcResiUserDTO;
+import com.epmet.excel.IcResiUserExcel;
+import com.epmet.service.IcResiUserService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * 用户基础信息
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-10-26
+ */
+@RestController
+@RequestMapping("icresiuser")
+public class IcResiUserController {
+    
+    @Autowired
+    private IcResiUserService icResiUserService;
+
+    @GetMapping("page")
+    public Result<PageData<IcResiUserDTO>> page(@RequestParam Map<String, Object> params){
+        PageData<IcResiUserDTO> page = icResiUserService.page(params);
+        return new Result<PageData<IcResiUserDTO>>().ok(page);
+    }
+
+    @GetMapping("{id}")
+    public Result<IcResiUserDTO> get(@PathVariable("id") String id){
+        IcResiUserDTO data = icResiUserService.get(id);
+        return new Result<IcResiUserDTO>().ok(data);
+    }
+
+    @PostMapping
+    public Result save(@RequestBody IcResiUserDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+        icResiUserService.save(dto);
+        return new Result();
+    }
+
+    @PutMapping
+    public Result update(@RequestBody IcResiUserDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+        icResiUserService.update(dto);
+        return new Result();
+    }
+
+    @DeleteMapping
+    public Result delete(@RequestBody String[] ids){
+        //效验数据
+        AssertUtils.isArrayEmpty(ids, "id");
+        icResiUserService.delete(ids);
+        return new Result();
+    }
+
+    @GetMapping("export")
+    public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
+        List<IcResiUserDTO> list = icResiUserService.list(params);
+        ExcelUtils.exportExcelToTarget(response, null, list, IcResiUserExcel.class);
+    }
+
+}
\ No newline at end of file
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java
new file mode 100644
index 0000000000..85ee8dc125
--- /dev/null
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java
@@ -0,0 +1,33 @@
+/**
+ * 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.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.entity.IcResiUserEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 用户基础信息
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-10-26
+ */
+@Mapper
+public interface IcResiUserDao extends BaseDao<IcResiUserEntity> {
+	
+}
\ No newline at end of file
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcEnsureHouseEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcEnsureHouseEntity.java
new file mode 100644
index 0000000000..917382ceb9
--- /dev/null
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcEnsureHouseEntity.java
@@ -0,0 +1,101 @@
+/**
+ * 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.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * 保障房
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-10-26
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("ic_ensure_house")
+public class IcEnsureHouseEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 客户Id customer.id
+     */
+	private String customerId;
+
+    /**
+     * 主表Id
+     */
+	private String icResiUser;
+
+    /**
+     * 住房性质【字典表】
+     */
+	private String zfxz;
+
+    /**
+     * 保障类型
+     */
+	private String bzlx;
+
+    /**
+     * 发证日期
+     */
+	private Date fzrq;
+
+    /**
+     * 补贴编号
+     */
+	private String btbh;
+
+    /**
+     * 补贴金额
+     */
+	private String btje;
+
+    /**
+     * 预留字段1
+     */
+	private String field1;
+
+    /**
+     * 预留字段2
+     */
+	private String field2;
+
+    /**
+     * 预留字段3
+     */
+	private String field3;
+
+    /**
+     * 预留字段4
+     */
+	private String field4;
+
+    /**
+     * 预留字段5
+     */
+	private String field5;
+
+}
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcOldPeopleEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcOldPeopleEntity.java
new file mode 100644
index 0000000000..ba5835c5da
--- /dev/null
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcOldPeopleEntity.java
@@ -0,0 +1,81 @@
+/**
+ * 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.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * 老年人
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-10-26
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("ic_old_people")
+public class IcOldPeopleEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 客户Id customer.id
+     */
+	private String customerId;
+
+    /**
+     * 主表Id
+     */
+	private String icResiUser;
+
+    /**
+     * 高龄补助
+     */
+	private String glbz;
+
+    /**
+     * 预留字段1
+     */
+	private String field1;
+
+    /**
+     * 预留字段2
+     */
+	private String field2;
+
+    /**
+     * 预留字段3
+     */
+	private String field3;
+
+    /**
+     * 预留字段4
+     */
+	private String field4;
+
+    /**
+     * 预留字段5
+     */
+	private String field5;
+
+}
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcPartyMemberEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcPartyMemberEntity.java
new file mode 100644
index 0000000000..90b543dd6e
--- /dev/null
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcPartyMemberEntity.java
@@ -0,0 +1,116 @@
+/**
+ * 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.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * 党员
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-10-26
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("ic_party_member")
+public class IcPartyMemberEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 客户Id customer.id
+     */
+	private String customerId;
+
+    /**
+     * 主表Id
+     */
+	private String icResiUser;
+
+    /**
+     * 入党时间
+     */
+	private Date rdsj;
+
+    /**
+     * 转正时间
+     */
+	private Date zzsj;
+
+    /**
+     * 所属支部
+     */
+	private String sszb;
+
+    /**
+     * 是否流动党员
+     */
+	private String isLd;
+
+    /**
+     * 流动党员活动证号
+     */
+	private String ldzh;
+
+    /**
+     * 职务
+     */
+	private String partyZw;
+
+    /**
+     * 是否退休
+     */
+	private String isTx;
+
+    /**
+     * 是否党员中心户
+     */
+	private String isDyzxh;
+
+    /**
+     * 预留字段1
+     */
+	private String field1;
+
+    /**
+     * 预留字段2
+     */
+	private String field2;
+
+    /**
+     * 预留字段3
+     */
+	private String field3;
+
+    /**
+     * 预留字段4
+     */
+	private String field4;
+
+    /**
+     * 预留字段5
+     */
+	private String field5;
+
+}
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiDemandEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiDemandEntity.java
new file mode 100644
index 0000000000..6e2b9ac670
--- /dev/null
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiDemandEntity.java
@@ -0,0 +1,101 @@
+/**
+ * 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.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * 居民需求
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-10-26
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("ic_resi_demand")
+public class IcResiDemandEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 客户Id customer.id
+     */
+	private String customerId;
+
+    /**
+     * 主表Id
+     */
+	private String icResiUser;
+
+    /**
+     * 大类Id
+     */
+	private Date bigClass;
+
+    /**
+     * 大类名称
+     */
+	private Date bigClassName;
+
+    /**
+     * 小类Id
+     */
+	private String smallClass;
+
+    /**
+     * 小类名称
+     */
+	private String smallClassName;
+
+    /**
+     * 描述
+     */
+	private String remakes;
+
+    /**
+     * 预留字段1
+     */
+	private String field1;
+
+    /**
+     * 预留字段2
+     */
+	private String field2;
+
+    /**
+     * 预留字段3
+     */
+	private String field3;
+
+    /**
+     * 预留字段4
+     */
+	private String field4;
+
+    /**
+     * 预留字段5
+     */
+	private String field5;
+
+}
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiUserEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiUserEntity.java
new file mode 100644
index 0000000000..0129c18843
--- /dev/null
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiUserEntity.java
@@ -0,0 +1,496 @@
+/**
+ * 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.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * 用户基础信息
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-10-26
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("ic_resi_user")
+public class IcResiUserEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 客户Id customer.id
+     */
+	private String customerId;
+
+    /**
+     * 
+     */
+	private String agencyId;
+
+    /**
+     * 
+     */
+	private String pids;
+
+    /**
+     * 网格ID
+     */
+	private String gridId;
+
+    /**
+     * 所属小区ID
+     */
+	private String villageId;
+
+    /**
+     * 所属楼宇Id
+     */
+	private String buildId;
+
+    /**
+     * 所属家庭Id
+     */
+	private String homeId;
+
+    /**
+     * 是否本地户籍
+     */
+	private String isBdhj;
+
+    /**
+     * 姓名
+     */
+	private String name;
+
+    /**
+     * 手机号
+     */
+	private String mobile;
+
+    /**
+     * 性别
+     */
+	private String gender;
+
+    /**
+     * 身份证号
+     */
+	private String idCard;
+
+    /**
+     * 出生日期
+     */
+	private String birthday;
+
+    /**
+     * 备注
+     */
+	private String remarks;
+
+    /**
+     * 联系人
+     */
+	private String contacts;
+
+    /**
+     * 联系人电话
+     */
+	private String contactsMobile;
+
+    /**
+     * 九小场所url
+     */
+	private String ninePlace;
+
+    /**
+     * 是否党员
+     */
+	private String isParty;
+
+    /**
+     * 是否低保户
+     */
+	private String isDbh;
+
+    /**
+     * 是否保障房
+     */
+	private String isEnsureHouse;
+
+    /**
+     * 是否失业
+     */
+	private String isUnemployed;
+
+    /**
+     * 是否育龄妇女
+     */
+	private String isYlfn;
+
+    /**
+     * 是否退役军人
+     */
+	private String isVeterans;
+
+    /**
+     * 是否统战人员
+     */
+	private String isUnitedFront;
+
+    /**
+     * 是否信访人员
+     */
+	private String isXfry;
+
+    /**
+     * 是否志愿者
+     */
+	private String isVolunteer;
+
+    /**
+     * 是否老年人
+     */
+	private String isOldPeople;
+
+    /**
+     * 是否空巢
+     */
+	private String isKc;
+
+    /**
+     * 是否失独
+     */
+	private String isSd;
+
+    /**
+     * 是否失能
+     */
+	private String isSn;
+
+    /**
+     * 是否失智
+     */
+	private String isSz;
+
+    /**
+     * 是否残疾
+     */
+	private String isCj;
+
+    /**
+     * 是否大病
+     */
+	private String isDb;
+
+    /**
+     * 是否慢病
+     */
+	private String isMb;
+
+    /**
+     * 是否特殊人群
+     */
+	private String isSpecial;
+
+    /**
+     * 文化程度【字典表】
+     */
+	private String culture;
+
+    /**
+     * 文化程度备注
+     */
+	private String cultureRemakes;
+
+    /**
+     * 特长【字典表】
+     */
+	private String specialSkill;
+
+    /**
+     * 兴趣爱好
+     */
+	private String hobby;
+
+    /**
+     * 兴趣爱好备注
+     */
+	private String hobbyRemakes;
+
+    /**
+     * 宗教信仰
+     */
+	private String faith;
+
+    /**
+     * 宗教信仰备注
+     */
+	private String faithRemakes;
+
+    /**
+     * 残疾类别【字典表】
+     */
+	private String cjlb;
+
+    /**
+     * 残疾登记(状况)【字典表】
+     */
+	private String cjzk;
+
+    /**
+     * 残疾证号
+     */
+	private String cjzh;
+
+    /**
+     * 残疾说明
+     */
+	private String cjsm;
+
+    /**
+     * 有无监护人【yes no】
+     */
+	private String ynJdr;
+
+    /**
+     * 有无技能特长【yes no】
+     */
+	private String ynJntc;
+
+    /**
+     * 有无劳动能力
+     */
+	private String ynLdnl;
+
+    /**
+     * 有无非义务教育阶段助学【yes no】
+     */
+	private String ynFywjyjdzx;
+
+    /**
+     * 所患大病
+     */
+	private String shdb;
+
+    /**
+     * 患大病时间
+     */
+	private Date dbsj;
+
+    /**
+     * 所患慢性病
+     */
+	private String shmxb;
+
+    /**
+     * 患慢性病时间
+     */
+	private Date mxbsj;
+
+    /**
+     * 是否参保
+     */
+	private String isCb;
+
+    /**
+     * 自付金额
+     */
+	private String zfje;
+
+    /**
+     * 救助金额
+     */
+	private String jzje;
+
+    /**
+     * 救助时间[yyyy-MM-dd]
+     */
+	private Date jzsj;
+
+    /**
+     * 享受救助明细序号
+     */
+	private String jzmxxh;
+
+    /**
+     * 健康信息备注
+     */
+	private String healthRemakes;
+
+    /**
+     * 工作单位
+     */
+	private String gzdw;
+
+    /**
+     * 职业
+     */
+	private String zy;
+
+    /**
+     * 离退休时间
+     */
+	private Date ltxsj;
+
+    /**
+     * 工作信息备注
+     */
+	private String workRemake;
+
+    /**
+     * 退休金额
+     */
+	private String txje;
+
+    /**
+     * 月收入
+     */
+	private String ysr;
+
+    /**
+     * 是否经济低保
+     */
+	private String isJjdb;
+
+    /**
+     * 籍贯
+     */
+	private String jg;
+
+    /**
+     * 户籍所在地
+     */
+	private String hjszd;
+
+    /**
+     * 现居住地
+     */
+	private String xjzd;
+
+    /**
+     * 人户情况
+     */
+	private String rhzk;
+
+    /**
+     * 居住信息备注
+     */
+	private String jzxxRemakes;
+
+    /**
+     * 民族【字典表】
+     */
+	private String mz;
+
+    /**
+     * 与户主关系【字典表】
+     */
+	private String yhzgx;
+
+    /**
+     * 居住情况【字典表】
+     */
+	private String jzqk;
+
+    /**
+     * 婚姻状况【字典表】
+     */
+	private String hyzk;
+
+    /**
+     * 配偶情况【字典表】
+     */
+	private String poqk;
+
+    /**
+     * 有无赡养人
+     */
+	private String ynSyr;
+
+    /**
+     * 与赡养人关系【字典表】
+     */
+	private String ysyrgx;
+
+    /**
+     * 赡养人电话
+     */
+	private String syrMobile;
+
+    /**
+     * 家庭信息备注
+     */
+	private String jtxxRemakes;
+
+    /**
+     * 预留字段1
+     */
+	private String field1;
+
+    /**
+     * 预留字段2
+     */
+	private String field2;
+
+    /**
+     * 预留字段3
+     */
+	private String field3;
+
+    /**
+     * 预留字段4
+     */
+	private String field4;
+
+    /**
+     * 预留字段5
+     */
+	private String field5;
+
+    /**
+     * 预留字段6
+     */
+	private String field6;
+
+    /**
+     * 预留字段7
+     */
+	private String field7;
+
+    /**
+     * 预留字段8
+     */
+	private String field8;
+
+    /**
+     * 预留字段9
+     */
+	private String field9;
+
+    /**
+     * 预留字段10
+     */
+	private String field10;
+
+}
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcSpecialEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcSpecialEntity.java
new file mode 100644
index 0000000000..4a63f28cf5
--- /dev/null
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcSpecialEntity.java
@@ -0,0 +1,81 @@
+/**
+ * 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.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * 特殊人群
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-10-26
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("ic_special")
+public class IcSpecialEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 客户Id customer.id
+     */
+	private String customerId;
+
+    /**
+     * 主表Id
+     */
+	private String icResiUser;
+
+    /**
+     * 人群类别【字典表】
+     */
+	private String specialRqlb;
+
+    /**
+     * 预留字段1
+     */
+	private String field1;
+
+    /**
+     * 预留字段2
+     */
+	private String field2;
+
+    /**
+     * 预留字段3
+     */
+	private String field3;
+
+    /**
+     * 预留字段4
+     */
+	private String field4;
+
+    /**
+     * 预留字段5
+     */
+	private String field5;
+
+}
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcUnemployedEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcUnemployedEntity.java
new file mode 100644
index 0000000000..c81f359e09
--- /dev/null
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcUnemployedEntity.java
@@ -0,0 +1,121 @@
+/**
+ * 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.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * 失业人员
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-10-26
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("ic_unemployed")
+public class IcUnemployedEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 客户Id customer.id
+     */
+	private String customerId;
+
+    /**
+     * 主表Id
+     */
+	private String icResiUser;
+
+    /**
+     * 原工作单位
+     */
+	private String ygzdw;
+
+    /**
+     * 失业人员类别【字典表】
+     */
+	private String syrylb;
+
+    /**
+     * 失业时间
+     */
+	private Date sysj;
+
+    /**
+     * 失业证号
+     */
+	private String syzh;
+
+    /**
+     * 再就业优惠证号
+     */
+	private String zjyyhzh;
+
+    /**
+     * 技术特长
+     */
+	private String jstc;
+
+    /**
+     * 失业原因【字典表】
+     */
+	private String syyy;
+
+    /**
+     * 是否就业困难对象
+     */
+	private String isJykndx;
+
+    /**
+     * 劳动能力就业愿望
+     */
+	private String jyyw;
+
+    /**
+     * 预留字段1
+     */
+	private String field1;
+
+    /**
+     * 预留字段2
+     */
+	private String field2;
+
+    /**
+     * 预留字段3
+     */
+	private String field3;
+
+    /**
+     * 预留字段4
+     */
+	private String field4;
+
+    /**
+     * 预留字段5
+     */
+	private String field5;
+
+}
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcUnitedFrontEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcUnitedFrontEntity.java
new file mode 100644
index 0000000000..71b0939e67
--- /dev/null
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcUnitedFrontEntity.java
@@ -0,0 +1,86 @@
+/**
+ * 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.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * 统战人员
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-10-26
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("ic_united_front")
+public class IcUnitedFrontEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 客户Id customer.id
+     */
+	private String customerId;
+
+    /**
+     * 主表Id
+     */
+	private String icResiUser;
+
+    /**
+     * 职务职业
+     */
+	private String zwzy;
+
+    /**
+     * 探亲情况
+     */
+	private String tqqk;
+
+    /**
+     * 预留字段1
+     */
+	private String field1;
+
+    /**
+     * 预留字段2
+     */
+	private String field2;
+
+    /**
+     * 预留字段3
+     */
+	private String field3;
+
+    /**
+     * 预留字段4
+     */
+	private String field4;
+
+    /**
+     * 预留字段5
+     */
+	private String field5;
+
+}
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcVeteransEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcVeteransEntity.java
new file mode 100644
index 0000000000..68720a6be5
--- /dev/null
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcVeteransEntity.java
@@ -0,0 +1,116 @@
+/**
+ * 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.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * 退役军人
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-10-26
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("ic_veterans")
+public class IcVeteransEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 客户Id customer.id
+     */
+	private String customerId;
+
+    /**
+     * 主表Id
+     */
+	private String icResiUser;
+
+    /**
+     * 入伍时间
+     */
+	private Date rwsj;
+
+    /**
+     * 退伍时间
+     */
+	private Date twsj;
+
+    /**
+     * 服役单位
+     */
+	private String fydw;
+
+    /**
+     * 接收单位
+     */
+	private String jsdw;
+
+    /**
+     * 待安置补助金
+     */
+	private String dazbzj;
+
+    /**
+     * 培训状况
+     */
+	private String pxzk;
+
+    /**
+     * 参战时间【年月日区间值yyyy-MM-dd~yyyy-MM-dd】
+     */
+	private Date czsj;
+
+    /**
+     * 现就业情况
+     */
+	private String xjyqk;
+
+    /**
+     * 预留字段1
+     */
+	private String field1;
+
+    /**
+     * 预留字段2
+     */
+	private String field2;
+
+    /**
+     * 预留字段3
+     */
+	private String field3;
+
+    /**
+     * 预留字段4
+     */
+	private String field4;
+
+    /**
+     * 预留字段5
+     */
+	private String field5;
+
+}
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcVolunteerEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcVolunteerEntity.java
new file mode 100644
index 0000000000..b5693d7e7f
--- /dev/null
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcVolunteerEntity.java
@@ -0,0 +1,86 @@
+/**
+ * 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.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * 志愿者
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-10-26
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("ic_volunteer")
+public class IcVolunteerEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 客户Id customer.id
+     */
+	private String customerId;
+
+    /**
+     * 主表Id
+     */
+	private String icResiUser;
+
+    /**
+     * 类别【字典表】
+     */
+	private String volunteerCategory;
+
+    /**
+     * 备注
+     */
+	private String volunteerRemark;
+
+    /**
+     * 预留字段1
+     */
+	private String field1;
+
+    /**
+     * 预留字段2
+     */
+	private String field2;
+
+    /**
+     * 预留字段3
+     */
+	private String field3;
+
+    /**
+     * 预留字段4
+     */
+	private String field4;
+
+    /**
+     * 预留字段5
+     */
+	private String field5;
+
+}
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcEnsureHouseExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcEnsureHouseExcel.java
new file mode 100644
index 0000000000..ea5f69f3d3
--- /dev/null
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcEnsureHouseExcel.java
@@ -0,0 +1,92 @@
+/**
+ * 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.excel;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 保障房
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-10-26
+ */
+@Data
+public class IcEnsureHouseExcel {
+
+    @Excel(name = "唯一标识")
+    private String id;
+
+    @Excel(name = "客户Id customer.id")
+    private String customerId;
+
+    @Excel(name = "主表Id")
+    private String icResiUser;
+
+    @Excel(name = "住房性质【字典表】")
+    private String zfxz;
+
+    @Excel(name = "保障类型")
+    private String bzlx;
+
+    @Excel(name = "发证日期")
+    private Date fzrq;
+
+    @Excel(name = "补贴编号")
+    private String btbh;
+
+    @Excel(name = "补贴金额")
+    private String btje;
+
+    @Excel(name = "删除标识 0.未删除 1.已删除")
+    private Integer delFlag;
+
+    @Excel(name = "乐观锁")
+    private Integer revision;
+
+    @Excel(name = "创建人")
+    private String createdBy;
+
+    @Excel(name = "创建时间")
+    private Date createdTime;
+
+    @Excel(name = "更新人")
+    private String updatedBy;
+
+    @Excel(name = "更新时间")
+    private Date updatedTime;
+
+    @Excel(name = "预留字段1")
+    private String field1;
+
+    @Excel(name = "预留字段2")
+    private String field2;
+
+    @Excel(name = "预留字段3")
+    private String field3;
+
+    @Excel(name = "预留字段4")
+    private String field4;
+
+    @Excel(name = "预留字段5")
+    private String field5;
+
+
+}
\ No newline at end of file
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcOldPeopleExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcOldPeopleExcel.java
new file mode 100644
index 0000000000..42294485ea
--- /dev/null
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcOldPeopleExcel.java
@@ -0,0 +1,80 @@
+/**
+ * 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.excel;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 老年人
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-10-26
+ */
+@Data
+public class IcOldPeopleExcel {
+
+    @Excel(name = "唯一标识")
+    private String id;
+
+    @Excel(name = "客户Id customer.id")
+    private String customerId;
+
+    @Excel(name = "主表Id")
+    private String icResiUser;
+
+    @Excel(name = "高龄补助")
+    private String glbz;
+
+    @Excel(name = "删除标识 0.未删除 1.已删除")
+    private Integer delFlag;
+
+    @Excel(name = "乐观锁")
+    private Integer revision;
+
+    @Excel(name = "创建人")
+    private String createdBy;
+
+    @Excel(name = "创建时间")
+    private Date createdTime;
+
+    @Excel(name = "更新人")
+    private String updatedBy;
+
+    @Excel(name = "更新时间")
+    private Date updatedTime;
+
+    @Excel(name = "预留字段1")
+    private String field1;
+
+    @Excel(name = "预留字段2")
+    private String field2;
+
+    @Excel(name = "预留字段3")
+    private String field3;
+
+    @Excel(name = "预留字段4")
+    private String field4;
+
+    @Excel(name = "预留字段5")
+    private String field5;
+
+
+}
\ No newline at end of file
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPartyMemberExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPartyMemberExcel.java
new file mode 100644
index 0000000000..71e3ed92a9
--- /dev/null
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPartyMemberExcel.java
@@ -0,0 +1,101 @@
+/**
+ * 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.excel;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 党员
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-10-26
+ */
+@Data
+public class IcPartyMemberExcel {
+
+    @Excel(name = "唯一标识")
+    private String id;
+
+    @Excel(name = "客户Id customer.id")
+    private String customerId;
+
+    @Excel(name = "主表Id")
+    private String icResiUser;
+
+    @Excel(name = "入党时间")
+    private Date rdsj;
+
+    @Excel(name = "转正时间")
+    private Date zzsj;
+
+    @Excel(name = "所属支部")
+    private String sszb;
+
+    @Excel(name = "是否流动党员")
+    private String isLd;
+
+    @Excel(name = "流动党员活动证号")
+    private String ldzh;
+
+    @Excel(name = "职务")
+    private String partyZw;
+
+    @Excel(name = "是否退休")
+    private String isTx;
+
+    @Excel(name = "是否党员中心户")
+    private String isDyzxh;
+
+    @Excel(name = "删除标识 0.未删除 1.已删除")
+    private Integer delFlag;
+
+    @Excel(name = "乐观锁")
+    private Integer revision;
+
+    @Excel(name = "创建人")
+    private String createdBy;
+
+    @Excel(name = "创建时间")
+    private Date createdTime;
+
+    @Excel(name = "更新人")
+    private String updatedBy;
+
+    @Excel(name = "更新时间")
+    private Date updatedTime;
+
+    @Excel(name = "预留字段1")
+    private String field1;
+
+    @Excel(name = "预留字段2")
+    private String field2;
+
+    @Excel(name = "预留字段3")
+    private String field3;
+
+    @Excel(name = "预留字段4")
+    private String field4;
+
+    @Excel(name = "预留字段5")
+    private String field5;
+
+
+}
\ No newline at end of file
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcResiDemandExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcResiDemandExcel.java
new file mode 100644
index 0000000000..8f257a3264
--- /dev/null
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcResiDemandExcel.java
@@ -0,0 +1,92 @@
+/**
+ * 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.excel;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 居民需求
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-10-26
+ */
+@Data
+public class IcResiDemandExcel {
+
+    @Excel(name = "唯一标识")
+    private String id;
+
+    @Excel(name = "客户Id customer.id")
+    private String customerId;
+
+    @Excel(name = "主表Id")
+    private String icResiUser;
+
+    @Excel(name = "大类Id")
+    private Date bigClass;
+
+    @Excel(name = "大类名称")
+    private Date bigClassName;
+
+    @Excel(name = "小类Id")
+    private String smallClass;
+
+    @Excel(name = "小类名称")
+    private String smallClassName;
+
+    @Excel(name = "描述")
+    private String remakes;
+
+    @Excel(name = "删除标识 0.未删除 1.已删除")
+    private Integer delFlag;
+
+    @Excel(name = "乐观锁")
+    private Integer revision;
+
+    @Excel(name = "创建人")
+    private String createdBy;
+
+    @Excel(name = "创建时间")
+    private Date createdTime;
+
+    @Excel(name = "更新人")
+    private String updatedBy;
+
+    @Excel(name = "更新时间")
+    private Date updatedTime;
+
+    @Excel(name = "预留字段1")
+    private String field1;
+
+    @Excel(name = "预留字段2")
+    private String field2;
+
+    @Excel(name = "预留字段3")
+    private String field3;
+
+    @Excel(name = "预留字段4")
+    private String field4;
+
+    @Excel(name = "预留字段5")
+    private String field5;
+
+
+}
\ No newline at end of file
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcResiUserExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcResiUserExcel.java
new file mode 100644
index 0000000000..a3abac4d57
--- /dev/null
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcResiUserExcel.java
@@ -0,0 +1,329 @@
+/**
+ * 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.excel;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 用户基础信息
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-10-26
+ */
+@Data
+public class IcResiUserExcel {
+
+    @Excel(name = "主键")
+    private String id;
+
+    @Excel(name = "客户Id customer.id")
+    private String customerId;
+
+    @Excel(name = "")
+    private String agencyId;
+
+    @Excel(name = "")
+    private String pids;
+
+    @Excel(name = "网格ID")
+    private String gridId;
+
+    @Excel(name = "所属小区ID")
+    private String villageId;
+
+    @Excel(name = "所属楼宇Id")
+    private String buildId;
+
+    @Excel(name = "所属家庭Id")
+    private String homeId;
+
+    @Excel(name = "是否本地户籍")
+    private String isBdhj;
+
+    @Excel(name = "姓名")
+    private String name;
+
+    @Excel(name = "手机号")
+    private String mobile;
+
+    @Excel(name = "性别")
+    private String gender;
+
+    @Excel(name = "身份证号")
+    private String idCard;
+
+    @Excel(name = "出生日期")
+    private String birthday;
+
+    @Excel(name = "备注")
+    private String remarks;
+
+    @Excel(name = "联系人")
+    private String contacts;
+
+    @Excel(name = "联系人电话")
+    private String contactsMobile;
+
+    @Excel(name = "九小场所url")
+    private String ninePlace;
+
+    @Excel(name = "是否党员")
+    private String isParty;
+
+    @Excel(name = "是否低保户")
+    private String isDbh;
+
+    @Excel(name = "是否保障房")
+    private String isEnsureHouse;
+
+    @Excel(name = "是否失业")
+    private String isUnemployed;
+
+    @Excel(name = "是否育龄妇女")
+    private String isYlfn;
+
+    @Excel(name = "是否退役军人")
+    private String isVeterans;
+
+    @Excel(name = "是否统战人员")
+    private String isUnitedFront;
+
+    @Excel(name = "是否信访人员")
+    private String isXfry;
+
+    @Excel(name = "是否志愿者")
+    private String isVolunteer;
+
+    @Excel(name = "是否老年人")
+    private String isOldPeople;
+
+    @Excel(name = "是否空巢")
+    private String isKc;
+
+    @Excel(name = "是否失独")
+    private String isSd;
+
+    @Excel(name = "是否失能")
+    private String isSn;
+
+    @Excel(name = "是否失智")
+    private String isSz;
+
+    @Excel(name = "是否残疾")
+    private String isCj;
+
+    @Excel(name = "是否大病")
+    private String isDb;
+
+    @Excel(name = "是否慢病")
+    private String isMb;
+
+    @Excel(name = "是否特殊人群")
+    private String isSpecial;
+
+    @Excel(name = "文化程度【字典表】")
+    private String culture;
+
+    @Excel(name = "文化程度备注")
+    private String cultureRemakes;
+
+    @Excel(name = "特长【字典表】")
+    private String specialSkill;
+
+    @Excel(name = "兴趣爱好")
+    private String hobby;
+
+    @Excel(name = "兴趣爱好备注")
+    private String hobbyRemakes;
+
+    @Excel(name = "宗教信仰")
+    private String faith;
+
+    @Excel(name = "宗教信仰备注")
+    private String faithRemakes;
+
+    @Excel(name = "残疾类别【字典表】")
+    private String cjlb;
+
+    @Excel(name = "残疾登记(状况)【字典表】")
+    private String cjzk;
+
+    @Excel(name = "残疾证号")
+    private String cjzh;
+
+    @Excel(name = "残疾说明")
+    private String cjsm;
+
+    @Excel(name = "有无监护人【yes no】")
+    private String ynJdr;
+
+    @Excel(name = "有无技能特长【yes no】")
+    private String ynJntc;
+
+    @Excel(name = "有无劳动能力")
+    private String ynLdnl;
+
+    @Excel(name = "有无非义务教育阶段助学【yes no】")
+    private String ynFywjyjdzx;
+
+    @Excel(name = "所患大病")
+    private String shdb;
+
+    @Excel(name = "患大病时间")
+    private Date dbsj;
+
+    @Excel(name = "所患慢性病")
+    private String shmxb;
+
+    @Excel(name = "患慢性病时间")
+    private Date mxbsj;
+
+    @Excel(name = "是否参保")
+    private String isCb;
+
+    @Excel(name = "自付金额")
+    private String zfje;
+
+    @Excel(name = "救助金额")
+    private String jzje;
+
+    @Excel(name = "救助时间[yyyy-MM-dd]")
+    private Date jzsj;
+
+    @Excel(name = "享受救助明细序号")
+    private String jzmxxh;
+
+    @Excel(name = "健康信息备注")
+    private String healthRemakes;
+
+    @Excel(name = "工作单位")
+    private String gzdw;
+
+    @Excel(name = "职业")
+    private String zy;
+
+    @Excel(name = "离退休时间")
+    private Date ltxsj;
+
+    @Excel(name = "工作信息备注")
+    private String workRemake;
+
+    @Excel(name = "退休金额")
+    private String txje;
+
+    @Excel(name = "月收入")
+    private String ysr;
+
+    @Excel(name = "是否经济低保")
+    private String isJjdb;
+
+    @Excel(name = "籍贯")
+    private String jg;
+
+    @Excel(name = "户籍所在地")
+    private String hjszd;
+
+    @Excel(name = "现居住地")
+    private String xjzd;
+
+    @Excel(name = "人户情况")
+    private String rhzk;
+
+    @Excel(name = "居住信息备注")
+    private String jzxxRemakes;
+
+    @Excel(name = "民族【字典表】")
+    private String mz;
+
+    @Excel(name = "与户主关系【字典表】")
+    private String yhzgx;
+
+    @Excel(name = "居住情况【字典表】")
+    private String jzqk;
+
+    @Excel(name = "婚姻状况【字典表】")
+    private String hyzk;
+
+    @Excel(name = "配偶情况【字典表】")
+    private String poqk;
+
+    @Excel(name = "有无赡养人")
+    private String ynSyr;
+
+    @Excel(name = "与赡养人关系【字典表】")
+    private String ysyrgx;
+
+    @Excel(name = "赡养人电话")
+    private String syrMobile;
+
+    @Excel(name = "家庭信息备注")
+    private String jtxxRemakes;
+
+    @Excel(name = "删除标识 0.未删除 1.已删除")
+    private Integer delFlag;
+
+    @Excel(name = "乐观锁")
+    private Integer revision;
+
+    @Excel(name = "创建人")
+    private String createdBy;
+
+    @Excel(name = "创建时间")
+    private Date createdTime;
+
+    @Excel(name = "更新人")
+    private String updatedBy;
+
+    @Excel(name = "更新时间")
+    private Date updatedTime;
+
+    @Excel(name = "预留字段1")
+    private String field1;
+
+    @Excel(name = "预留字段2")
+    private String field2;
+
+    @Excel(name = "预留字段3")
+    private String field3;
+
+    @Excel(name = "预留字段4")
+    private String field4;
+
+    @Excel(name = "预留字段5")
+    private String field5;
+
+    @Excel(name = "预留字段6")
+    private String field6;
+
+    @Excel(name = "预留字段7")
+    private String field7;
+
+    @Excel(name = "预留字段8")
+    private String field8;
+
+    @Excel(name = "预留字段9")
+    private String field9;
+
+    @Excel(name = "预留字段10")
+    private String field10;
+
+
+}
\ No newline at end of file
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcSpecialExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcSpecialExcel.java
new file mode 100644
index 0000000000..fb62227dff
--- /dev/null
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcSpecialExcel.java
@@ -0,0 +1,80 @@
+/**
+ * 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.excel;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 特殊人群
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-10-26
+ */
+@Data
+public class IcSpecialExcel {
+
+    @Excel(name = "唯一标识")
+    private String id;
+
+    @Excel(name = "客户Id customer.id")
+    private String customerId;
+
+    @Excel(name = "主表Id")
+    private String icResiUser;
+
+    @Excel(name = "人群类别【字典表】")
+    private String specialRqlb;
+
+    @Excel(name = "删除标识 0.未删除 1.已删除")
+    private Integer delFlag;
+
+    @Excel(name = "乐观锁")
+    private Integer revision;
+
+    @Excel(name = "创建人")
+    private String createdBy;
+
+    @Excel(name = "创建时间")
+    private Date createdTime;
+
+    @Excel(name = "更新人")
+    private String updatedBy;
+
+    @Excel(name = "更新时间")
+    private Date updatedTime;
+
+    @Excel(name = "预留字段1")
+    private String field1;
+
+    @Excel(name = "预留字段2")
+    private String field2;
+
+    @Excel(name = "预留字段3")
+    private String field3;
+
+    @Excel(name = "预留字段4")
+    private String field4;
+
+    @Excel(name = "预留字段5")
+    private String field5;
+
+
+}
\ No newline at end of file
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcUnemployedExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcUnemployedExcel.java
new file mode 100644
index 0000000000..9c1b4d7e00
--- /dev/null
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcUnemployedExcel.java
@@ -0,0 +1,104 @@
+/**
+ * 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.excel;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 失业人员
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-10-26
+ */
+@Data
+public class IcUnemployedExcel {
+
+    @Excel(name = "唯一标识")
+    private String id;
+
+    @Excel(name = "客户Id customer.id")
+    private String customerId;
+
+    @Excel(name = "主表Id")
+    private String icResiUser;
+
+    @Excel(name = "原工作单位")
+    private String ygzdw;
+
+    @Excel(name = "失业人员类别【字典表】")
+    private String syrylb;
+
+    @Excel(name = "失业时间")
+    private Date sysj;
+
+    @Excel(name = "失业证号")
+    private String syzh;
+
+    @Excel(name = "再就业优惠证号")
+    private String zjyyhzh;
+
+    @Excel(name = "技术特长")
+    private String jstc;
+
+    @Excel(name = "失业原因【字典表】")
+    private String syyy;
+
+    @Excel(name = "是否就业困难对象")
+    private String isJykndx;
+
+    @Excel(name = "劳动能力就业愿望")
+    private String jyyw;
+
+    @Excel(name = "删除标识 0.未删除 1.已删除")
+    private Integer delFlag;
+
+    @Excel(name = "乐观锁")
+    private Integer revision;
+
+    @Excel(name = "创建人")
+    private String createdBy;
+
+    @Excel(name = "创建时间")
+    private Date createdTime;
+
+    @Excel(name = "更新人")
+    private String updatedBy;
+
+    @Excel(name = "更新时间")
+    private Date updatedTime;
+
+    @Excel(name = "预留字段1")
+    private String field1;
+
+    @Excel(name = "预留字段2")
+    private String field2;
+
+    @Excel(name = "预留字段3")
+    private String field3;
+
+    @Excel(name = "预留字段4")
+    private String field4;
+
+    @Excel(name = "预留字段5")
+    private String field5;
+
+
+}
\ No newline at end of file
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcUnitedFrontExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcUnitedFrontExcel.java
new file mode 100644
index 0000000000..ee65b95670
--- /dev/null
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcUnitedFrontExcel.java
@@ -0,0 +1,83 @@
+/**
+ * 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.excel;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 统战人员
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-10-26
+ */
+@Data
+public class IcUnitedFrontExcel {
+
+    @Excel(name = "唯一标识")
+    private String id;
+
+    @Excel(name = "客户Id customer.id")
+    private String customerId;
+
+    @Excel(name = "主表Id")
+    private String icResiUser;
+
+    @Excel(name = "职务职业")
+    private String zwzy;
+
+    @Excel(name = "探亲情况")
+    private String tqqk;
+
+    @Excel(name = "删除标识 0.未删除 1.已删除")
+    private Integer delFlag;
+
+    @Excel(name = "乐观锁")
+    private Integer revision;
+
+    @Excel(name = "创建人")
+    private String createdBy;
+
+    @Excel(name = "创建时间")
+    private Date createdTime;
+
+    @Excel(name = "更新人")
+    private String updatedBy;
+
+    @Excel(name = "更新时间")
+    private Date updatedTime;
+
+    @Excel(name = "预留字段1")
+    private String field1;
+
+    @Excel(name = "预留字段2")
+    private String field2;
+
+    @Excel(name = "预留字段3")
+    private String field3;
+
+    @Excel(name = "预留字段4")
+    private String field4;
+
+    @Excel(name = "预留字段5")
+    private String field5;
+
+
+}
\ No newline at end of file
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcVeteransExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcVeteransExcel.java
new file mode 100644
index 0000000000..8a290d5b3e
--- /dev/null
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcVeteransExcel.java
@@ -0,0 +1,101 @@
+/**
+ * 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.excel;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 退役军人
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-10-26
+ */
+@Data
+public class IcVeteransExcel {
+
+    @Excel(name = "唯一标识")
+    private String id;
+
+    @Excel(name = "客户Id customer.id")
+    private String customerId;
+
+    @Excel(name = "主表Id")
+    private String icResiUser;
+
+    @Excel(name = "入伍时间")
+    private Date rwsj;
+
+    @Excel(name = "退伍时间")
+    private Date twsj;
+
+    @Excel(name = "服役单位")
+    private String fydw;
+
+    @Excel(name = "接收单位")
+    private String jsdw;
+
+    @Excel(name = "待安置补助金")
+    private String dazbzj;
+
+    @Excel(name = "培训状况")
+    private String pxzk;
+
+    @Excel(name = "参战时间【年月日区间值yyyy-MM-dd~yyyy-MM-dd】")
+    private Date czsj;
+
+    @Excel(name = "现就业情况")
+    private String xjyqk;
+
+    @Excel(name = "删除标识 0.未删除 1.已删除")
+    private Integer delFlag;
+
+    @Excel(name = "乐观锁")
+    private Integer revision;
+
+    @Excel(name = "创建人")
+    private String createdBy;
+
+    @Excel(name = "创建时间")
+    private Date createdTime;
+
+    @Excel(name = "更新人")
+    private String updatedBy;
+
+    @Excel(name = "更新时间")
+    private Date updatedTime;
+
+    @Excel(name = "预留字段1")
+    private String field1;
+
+    @Excel(name = "预留字段2")
+    private String field2;
+
+    @Excel(name = "预留字段3")
+    private String field3;
+
+    @Excel(name = "预留字段4")
+    private String field4;
+
+    @Excel(name = "预留字段5")
+    private String field5;
+
+
+}
\ No newline at end of file
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcVolunteerExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcVolunteerExcel.java
new file mode 100644
index 0000000000..98c3f56002
--- /dev/null
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcVolunteerExcel.java
@@ -0,0 +1,83 @@
+/**
+ * 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.excel;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 志愿者
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-10-26
+ */
+@Data
+public class IcVolunteerExcel {
+
+    @Excel(name = "唯一标识")
+    private String id;
+
+    @Excel(name = "客户Id customer.id")
+    private String customerId;
+
+    @Excel(name = "主表Id")
+    private String icResiUser;
+
+    @Excel(name = "类别【字典表】")
+    private String volunteerCategory;
+
+    @Excel(name = "备注")
+    private String volunteerRemark;
+
+    @Excel(name = "删除标识 0.未删除 1.已删除")
+    private Integer delFlag;
+
+    @Excel(name = "乐观锁")
+    private Integer revision;
+
+    @Excel(name = "创建人")
+    private String createdBy;
+
+    @Excel(name = "创建时间")
+    private Date createdTime;
+
+    @Excel(name = "更新人")
+    private String updatedBy;
+
+    @Excel(name = "更新时间")
+    private Date updatedTime;
+
+    @Excel(name = "预留字段1")
+    private String field1;
+
+    @Excel(name = "预留字段2")
+    private String field2;
+
+    @Excel(name = "预留字段3")
+    private String field3;
+
+    @Excel(name = "预留字段4")
+    private String field4;
+
+    @Excel(name = "预留字段5")
+    private String field5;
+
+
+}
\ No newline at end of file
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/redis/IcResiUserRedis.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/redis/IcResiUserRedis.java
new file mode 100644
index 0000000000..1986418b32
--- /dev/null
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/redis/IcResiUserRedis.java
@@ -0,0 +1,47 @@
+/**
+ * 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.redis;
+
+import com.epmet.commons.tools.redis.RedisUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * 用户基础信息
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-10-26
+ */
+@Component
+public class IcResiUserRedis {
+    @Autowired
+    private RedisUtils redisUtils;
+
+    public void delete(Object[] ids) {
+
+    }
+
+    public void set(){
+
+    }
+
+    public String get(String id){
+        return null;
+    }
+
+}
\ No newline at end of file
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java
new file mode 100644
index 0000000000..5f66ecb881
--- /dev/null
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java
@@ -0,0 +1,95 @@
+/**
+ * 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;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.dto.IcResiUserDTO;
+import com.epmet.entity.IcResiUserEntity;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 用户基础信息
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-10-26
+ */
+public interface IcResiUserService extends BaseService<IcResiUserEntity> {
+
+    /**
+     * 默认分页
+     *
+     * @param params
+     * @return PageData<IcResiUserDTO>
+     * @author generator
+     * @date 2021-10-26
+     */
+    PageData<IcResiUserDTO> page(Map<String, Object> params);
+
+    /**
+     * 默认查询
+     *
+     * @param params
+     * @return java.util.List<IcResiUserDTO>
+     * @author generator
+     * @date 2021-10-26
+     */
+    List<IcResiUserDTO> list(Map<String, Object> params);
+
+    /**
+     * 单条查询
+     *
+     * @param id
+     * @return IcResiUserDTO
+     * @author generator
+     * @date 2021-10-26
+     */
+    IcResiUserDTO get(String id);
+
+    /**
+     * 默认保存
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2021-10-26
+     */
+    void save(IcResiUserDTO dto);
+
+    /**
+     * 默认更新
+     *
+     * @param dto
+     * @return void
+     * @author generator
+     * @date 2021-10-26
+     */
+    void update(IcResiUserDTO dto);
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return void
+     * @author generator
+     * @date 2021-10-26
+     */
+    void delete(String[] ids);
+}
\ No newline at end of file
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java
new file mode 100644
index 0000000000..002d3b248f
--- /dev/null
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java
@@ -0,0 +1,104 @@
+/**
+ * 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.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.dao.IcResiUserDao;
+import com.epmet.dto.IcResiUserDTO;
+import com.epmet.entity.IcResiUserEntity;
+import com.epmet.redis.IcResiUserRedis;
+import com.epmet.service.IcResiUserService;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 用户基础信息
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-10-26
+ */
+@Service
+public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResiUserEntity> implements IcResiUserService {
+
+    @Autowired
+    private IcResiUserRedis icResiUserRedis;
+
+    @Override
+    public PageData<IcResiUserDTO> page(Map<String, Object> params) {
+        IPage<IcResiUserEntity> page = baseDao.selectPage(
+                getPage(params, FieldConstant.CREATED_TIME, false),
+                getWrapper(params)
+        );
+        return getPageData(page, IcResiUserDTO.class);
+    }
+
+    @Override
+    public List<IcResiUserDTO> list(Map<String, Object> params) {
+        List<IcResiUserEntity> entityList = baseDao.selectList(getWrapper(params));
+
+        return ConvertUtils.sourceToTarget(entityList, IcResiUserDTO.class);
+    }
+
+    private QueryWrapper<IcResiUserEntity> getWrapper(Map<String, Object> params){
+        String id = (String)params.get(FieldConstant.ID_HUMP);
+
+        QueryWrapper<IcResiUserEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
+
+        return wrapper;
+    }
+
+    @Override
+    public IcResiUserDTO get(String id) {
+        IcResiUserEntity entity = baseDao.selectById(id);
+        return ConvertUtils.sourceToTarget(entity, IcResiUserDTO.class);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void save(IcResiUserDTO dto) {
+        IcResiUserEntity entity = ConvertUtils.sourceToTarget(dto, IcResiUserEntity.class);
+        insert(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void update(IcResiUserDTO dto) {
+        IcResiUserEntity entity = ConvertUtils.sourceToTarget(dto, IcResiUserEntity.class);
+        updateById(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void delete(String[] ids) {
+        // 逻辑删除（@TableLogic 注解）
+        baseDao.deleteBatchIds(Arrays.asList(ids));
+    }
+
+}
\ No newline at end of file
diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml
new file mode 100644
index 0000000000..135f7b6635
--- /dev/null
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.epmet.dao.IcResiUserDao">
+
+
+
+</mapper>
\ No newline at end of file

From 254676cbcde8597153a8a32d5f0767209d17bc07 Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Tue, 26 Oct 2021 14:09:04 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E6=96=B9=E6=B3=95=E6=A8=A1=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/dto/form/IcResiUserFormDTO.java | 25 +++++++++++++++++++
 .../controller/IcResiUserController.java      | 24 ++++++++++++++++++
 .../com/epmet/service/IcResiUserService.java  | 14 +++++++++++
 .../service/impl/IcResiUserServiceImpl.java   | 19 ++++++++++++++
 4 files changed, 82 insertions(+)
 create mode 100644 epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcResiUserFormDTO.java

diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcResiUserFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcResiUserFormDTO.java
new file mode 100644
index 0000000000..29ea3fa9b3
--- /dev/null
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcResiUserFormDTO.java
@@ -0,0 +1,25 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @Description 居民注册信息查询入参DTO
+ * @Author yinzuomei
+ * @Date 2020/3/30 10:26
+ */
+@Data
+public class IcResiUserFormDTO implements Serializable {
+	private static final long serialVersionUID = 9156247659994638103L;
+	@NotBlank(message = "徽章id不能为空", groups = {ManageGroup.class})
+	private String badgeId;
+	/**
+	 * 网格Id
+	 */
+	@NotBlank(message = "网格id不能为空", groups = {AuditGroup.class})
+	private String gridId;
+	public interface ManageGroup {}
+	public interface AuditGroup {}
+}
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java
index 37d3bde4d5..5dca820caf 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java
@@ -17,7 +17,9 @@
 
 package com.epmet.controller;
 
+import com.epmet.commons.tools.annotation.LoginUser;
 import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.ExcelUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.AssertUtils;
@@ -26,6 +28,8 @@ import com.epmet.commons.tools.validator.group.AddGroup;
 import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
 import com.epmet.dto.IcResiUserDTO;
+import com.epmet.dto.UserResiInfoDTO;
+import com.epmet.dto.form.IcResiUserFormDTO;
 import com.epmet.excel.IcResiUserExcel;
 import com.epmet.service.IcResiUserService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -91,4 +95,24 @@ public class IcResiUserController {
         ExcelUtils.exportExcelToTarget(response, null, list, IcResiUserExcel.class);
     }
 
+    /**
+     * @Author sun
+     * @Description 党建互联平台--保存居民信息
+     **/
+    @PostMapping("add")
+    public Result add(@LoginUser TokenDto tokenDto, @RequestBody IcResiUserFormDTO formDTO) {
+        icResiUserService.add(formDTO);
+        return new Result();
+    }
+
+    /**
+     * @Author sun
+     * @Description 党建互联平台--修改居民信息
+     **/
+    @PostMapping("edit")
+    public Result edit(@LoginUser TokenDto tokenDto, @RequestBody IcResiUserFormDTO formDTO) {
+        icResiUserService.edit(formDTO);
+        return new Result();
+    }
+
 }
\ No newline at end of file
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java
index 5f66ecb881..507e214ef5 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java
@@ -19,7 +19,9 @@ package com.epmet.service;
 
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.IcResiUserDTO;
+import com.epmet.dto.form.IcResiUserFormDTO;
 import com.epmet.entity.IcResiUserEntity;
 
 import java.util.List;
@@ -92,4 +94,16 @@ public interface IcResiUserService extends BaseService<IcResiUserEntity> {
      * @date 2021-10-26
      */
     void delete(String[] ids);
+
+    /**
+     * @Author sun
+     * @Description 党建互联平台--保存居民信息
+     **/
+    void add(IcResiUserFormDTO formDTO);
+
+    /**
+     * @Author sun
+     * @Description 党建互联平台--修改居民信息
+     **/
+    void edit(IcResiUserFormDTO formDTO);
 }
\ No newline at end of file
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java
index 002d3b248f..3a8c2b195a 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java
@@ -25,6 +25,7 @@ import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.dao.IcResiUserDao;
 import com.epmet.dto.IcResiUserDTO;
+import com.epmet.dto.form.IcResiUserFormDTO;
 import com.epmet.entity.IcResiUserEntity;
 import com.epmet.redis.IcResiUserRedis;
 import com.epmet.service.IcResiUserService;
@@ -101,4 +102,22 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
+    /**
+     * @Author sun
+     * @Description 党建互联平台--保存居民信息
+     **/
+    @Override
+    public void add(IcResiUserFormDTO formDTO) {
+
+    }
+
+    /**
+     * @Author sun
+     * @Description 党建互联平台--修改居民信息
+     **/
+    @Override
+    public void edit(IcResiUserFormDTO formDTO) {
+
+    }
+
 }
\ No newline at end of file

From 309bf86fcf2ec9b0002a2f486888a1c951eb63c0 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Tue, 26 Oct 2021 14:33:10 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=BB=84=E7=BB=87?=
 =?UTF-8?q?=E7=BA=A7=E5=88=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/epmet/dto/result/MapOrgResultDTO.java    | 6 ++++++
 .../main/java/com/epmet/dto/result/MapSonOrgResultDTO.java | 6 ++++++
 .../java/com/epmet/service/impl/AgencyServiceImpl.java     | 7 +++++++
 .../src/main/resources/mapper/CustomerAgencyDao.xml        | 3 +++
 4 files changed, 22 insertions(+)

diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/MapOrgResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/MapOrgResultDTO.java
index 7f92e3bdc1..5ad5436d9a 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/MapOrgResultDTO.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/MapOrgResultDTO.java
@@ -54,6 +54,11 @@ public class MapOrgResultDTO implements Serializable {
      */
     private String coordinates;
 
+    /**
+     * 组织级别
+     */
+    private String agencyLevel;
+
     /**
      * 下级结果集
      */
@@ -67,5 +72,6 @@ public class MapOrgResultDTO implements Serializable {
         this.level = "";
         this.coordinates = "";
         this.children = new ArrayList<>();
+        this.agencyLevel = "";
     }
 }
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/MapSonOrgResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/MapSonOrgResultDTO.java
index 77cb78266c..86b1a95c14 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/MapSonOrgResultDTO.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/MapSonOrgResultDTO.java
@@ -53,6 +53,11 @@ public class MapSonOrgResultDTO implements Serializable {
      */
     private String coordinates;
 
+    /**
+     * 组织级别
+     */
+    private String agencyLevel;
+
     public MapSonOrgResultDTO() {
         this.longitudeOrigin = "";
         this.latitudeOrigin = "";
@@ -60,5 +65,6 @@ public class MapSonOrgResultDTO implements Serializable {
         this.name = "";
         this.level = "";
         this.coordinates = "";
+        this.agencyLevel = "";
     }
 }
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java
index 3b5464f498..9de97fafbb 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java
@@ -561,6 +561,11 @@ public class AgencyServiceImpl implements AgencyService {
 
     /**
      * @Description 【地图配置】组织查询
+     * 根据level查询去查询不同的表，类型，组织：agency，网格：grid，小区：neighborHood
+     * 组织类型去查 customer_agency，看本级是不是 community，是，下级组织就是网格，查询customer_grid，不是，继续查customer_agency
+     * 网格类型去查 查询customer_grid，下级去查 ic_neighbor_hood，
+     * 当前组织没有经纬度的话，直接赋值根组织的经纬度，
+     * 下级组织经纬度为空的话，直接赋值上级的经纬度
      * @param formDTO
      * @param tokenDto
      * @author zxc
@@ -585,6 +590,7 @@ public class AgencyServiceImpl implements AgencyService {
             result = ConvertUtils.sourceToTarget(entity,MapOrgResultDTO.class);
             result.setName(entity.getOrganizationName());
             result.setLevel(formDTO.getLevel());
+            result.setAgencyLevel(entity.getLevel());
             result.setLatitude(StringUtils.isBlank(entity.getLatitude()) ? new BigDecimal(customerAgencyEntity.getLatitude()) : new BigDecimal(entity.getLatitude()));
             result.setLongitude(StringUtils.isBlank(entity.getLongitude()) ? new BigDecimal(customerAgencyEntity.getLongitude()) : new BigDecimal(entity.getLongitude()));
             if (entity.getLevel().equals(OrgInfoConstant.COMMUNITY)){
@@ -622,6 +628,7 @@ public class AgencyServiceImpl implements AgencyService {
             result = ConvertUtils.sourceToTarget(entity,MapOrgResultDTO.class);
             result.setName(entity.getGridName());
             result.setLevel(formDTO.getLevel());
+            result.setAgencyLevel(OrgInfoConstant.GRID);
             result.setLatitude(StringUtils.isBlank(entity.getLatitude()) ? new BigDecimal(customerAgencyEntity.getLatitude()) : new BigDecimal(entity.getLatitude()));
             result.setLongitude(StringUtils.isBlank(entity.getLongitude()) ? new BigDecimal(customerAgencyEntity.getLongitude()) : new BigDecimal(entity.getLongitude()));
             List<MapSonOrgResultDTO> son = customerAgencyDao.selectSonOrg(formDTO.getOrgId(), OrgInfoConstant.NEIGHBOR_HOOD);
diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml
index 3dcb3a472e..81696777f2 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml
@@ -584,14 +584,17 @@
             <if test='type == "agency" '>
                 organization_name AS name,
                'agency' AS level,
+               LEVEL AS agencyLevel,
             </if>
             <if test='type == "grid" '>
                 grid_name AS name,
                'grid' AS level,
+               'grid' AS agencyLevel,
             </if>
             <if test='type == "neighborHood" '>
                 neighbor_hood_name AS name,
                'neighborHood' AS level,
+               'neighborHood' AS agencyLevel,
             </if>
             IFNULL(longitude,'') AS longitudeOrigin,
             IFNULL(latitude,'') AS latitudeOrigin,