From d9e91c7349c7386bb87ed09e53c5009f493f82a9 Mon Sep 17 00:00:00 2001
From: zxc <954985706@qq.com>
Date: Mon, 11 May 2020 20:12:04 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E8=AE=AE=E9=A2=98=E7=94=9F?=
 =?UTF-8?q?=E6=88=90=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resi-hall-client/resi-hall-client.iml     | 145 +++++++++++++
 .../resi-hall-server/resi-hall-server.iml     | 196 ++++++++++++++++++
 .../IssueCustomerParameterController.java     |  94 ---------
 .../controller/IssueProcessController.java    |  94 ---------
 .../IssueProjectRelationController.java       |  94 ---------
 .../IssueSatisfactionDetailController.java    |  94 ---------
 ...ssueSatisfactionStatisticalController.java |  94 ---------
 .../controller/IssueVoteDetailController.java |  94 ---------
 .../IssueVoteStatisticalController.java       |  94 ---------
 .../IssueVoteStatisticalDailyController.java  |  94 ---------
 .../controller/ResiHallDemoController.java    |  27 ---
 .../epmet/dao/IssueCustomerParameterDao.java  |  33 ---
 .../src/main/java/com/epmet/dao/IssueDao.java |  43 ----
 .../java/com/epmet/dao/IssueProcessDao.java   |  33 ---
 .../epmet/dao/IssueProjectRelationDao.java    |  33 ---
 .../epmet/dao/IssueSatisfactionDetailDao.java |  33 ---
 .../dao/IssueSatisfactionStatisticalDao.java  |  33 ---
 .../com/epmet/dao/IssueVoteDetailDao.java     |  33 ---
 .../dao/IssueVoteStatisticalDailyDao.java     |  33 ---
 .../epmet/dao/IssueVoteStatisticalDao.java    |  33 ---
 .../entity/IssueCustomerParameterEntity.java  |  66 ------
 .../java/com/epmet/entity/IssueEntity.java    | 116 -----------
 .../com/epmet/entity/IssueProcessEntity.java  |  66 ------
 .../entity/IssueProjectRelationEntity.java    |  51 -----
 .../entity/IssueSatisfactionDetailEntity.java |  56 -----
 .../IssueSatisfactionStatisticalEntity.java   |  61 ------
 .../epmet/entity/IssueVoteDetailEntity.java   |  51 -----
 .../IssueVoteStatisticalDailyEntity.java      |  86 --------
 .../entity/IssueVoteStatisticalEntity.java    |  61 ------
 .../excel/IssueCustomerParameterExcel.java    |  71 -------
 .../main/java/com/epmet/excel/IssueExcel.java | 101 ---------
 .../com/epmet/excel/IssueProcessExcel.java    |  71 -------
 .../excel/IssueProjectRelationExcel.java      |  62 ------
 .../excel/IssueSatisfactionDetailExcel.java   |  65 ------
 .../IssueSatisfactionStatisticalExcel.java    |  68 ------
 .../com/epmet/excel/IssueVoteDetailExcel.java |  62 ------
 .../excel/IssueVoteStatisticalDailyExcel.java |  83 --------
 .../excel/IssueVoteStatisticalExcel.java      |  68 ------
 .../redis/IssueCustomerParameterRedis.java    |  47 -----
 .../com/epmet/redis/IssueProcessRedis.java    |  47 -----
 .../redis/IssueProjectRelationRedis.java      |  47 -----
 .../main/java/com/epmet/redis/IssueRedis.java |  47 -----
 .../redis/IssueSatisfactionDetailRedis.java   |  47 -----
 .../IssueSatisfactionStatisticalRedis.java    |  47 -----
 .../com/epmet/redis/IssueVoteDetailRedis.java |  47 -----
 .../redis/IssueVoteStatisticalDailyRedis.java |  47 -----
 .../redis/IssueVoteStatisticalRedis.java      |  47 -----
 .../IssueCustomerParameterService.java        |  95 ---------
 .../epmet/service/IssueProcessService.java    |  95 ---------
 .../service/IssueProjectRelationService.java  |  95 ---------
 .../IssueSatisfactionDetailService.java       |  95 ---------
 .../IssueSatisfactionStatisticalService.java  |  95 ---------
 .../epmet/service/IssueVoteDetailService.java |  95 ---------
 .../IssueVoteStatisticalDailyService.java     |  95 ---------
 .../service/IssueVoteStatisticalService.java  |  95 ---------
 .../IssueCustomerParameterServiceImpl.java    |  99 ---------
 .../service/impl/IssueProcessServiceImpl.java | 104 ----------
 .../impl/IssueProjectRelationServiceImpl.java | 104 ----------
 .../IssueSatisfactionDetailServiceImpl.java   | 104 ----------
 ...sueSatisfactionStatisticalServiceImpl.java | 104 ----------
 .../impl/IssueVoteDetailServiceImpl.java      | 104 ----------
 .../IssueVoteStatisticalDailyServiceImpl.java | 104 ----------
 .../impl/IssueVoteStatisticalServiceImpl.java | 104 ----------
 .../mapper/IssueCustomerParameterDao.xml      |  22 --
 .../main/resources/mapper/IssueProcessDao.xml |  22 --
 .../mapper/IssueProjectRelationDao.xml        |  19 --
 .../mapper/IssueSatisfactionDetailDao.xml     |  20 --
 .../IssueSatisfactionStatisticalDao.xml       |  21 --
 .../resources/mapper/IssueVoteDetailDao.xml   |  19 --
 .../mapper/IssueVoteStatisticalDailyDao.xml   |  26 ---
 .../mapper/IssueVoteStatisticalDao.xml        |  21 --
 epmet-module/resi-hall/resi-hall.iml          |  51 +++++
 72 files changed, 392 insertions(+), 4531 deletions(-)
 create mode 100644 epmet-module/resi-hall/resi-hall-client/resi-hall-client.iml
 create mode 100644 epmet-module/resi-hall/resi-hall-server/resi-hall-server.iml
 delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueCustomerParameterController.java
 delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueProcessController.java
 delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueProjectRelationController.java
 delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueSatisfactionDetailController.java
 delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueSatisfactionStatisticalController.java
 delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueVoteDetailController.java
 delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueVoteStatisticalController.java
 delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueVoteStatisticalDailyController.java
 delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/ResiHallDemoController.java
 delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/dao/IssueCustomerParameterDao.java
 delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/dao/IssueDao.java
 delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/dao/IssueProcessDao.java
 delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/dao/IssueProjectRelationDao.java
 delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/dao/IssueSatisfactionDetailDao.java
 delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/dao/IssueSatisfactionStatisticalDao.java
 delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/dao/IssueVoteDetailDao.java
 delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/dao/IssueVoteStatisticalDailyDao.java
 delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/dao/IssueVoteStatisticalDao.java
 delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/entity/IssueCustomerParameterEntity.java
 delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/entity/IssueEntity.java
 delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/entity/IssueProcessEntity.java
 delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/entity/IssueProjectRelationEntity.java
 delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/entity/IssueSatisfactionDetailEntity.java
 delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/entity/IssueSatisfactionStatisticalEntity.java
 delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/entity/IssueVoteDetailEntity.java
 delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/entity/IssueVoteStatisticalDailyEntity.java
 delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/entity/IssueVoteStatisticalEntity.java
 delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/excel/IssueCustomerParameterExcel.java
 delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/excel/IssueExcel.java
 delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/excel/IssueProcessExcel.java
 delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/excel/IssueProjectRelationExcel.java
 delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/excel/IssueSatisfactionDetailExcel.java
 delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/excel/IssueSatisfactionStatisticalExcel.java
 delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/excel/IssueVoteDetailExcel.java
 delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/excel/IssueVoteStatisticalDailyExcel.java
 delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/excel/IssueVoteStatisticalExcel.java
 delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/redis/IssueCustomerParameterRedis.java
 delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/redis/IssueProcessRedis.java
 delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/redis/IssueProjectRelationRedis.java
 delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/redis/IssueRedis.java
 delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/redis/IssueSatisfactionDetailRedis.java
 delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/redis/IssueSatisfactionStatisticalRedis.java
 delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/redis/IssueVoteDetailRedis.java
 delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/redis/IssueVoteStatisticalDailyRedis.java
 delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/redis/IssueVoteStatisticalRedis.java
 delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/IssueCustomerParameterService.java
 delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/IssueProcessService.java
 delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/IssueProjectRelationService.java
 delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/IssueSatisfactionDetailService.java
 delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/IssueSatisfactionStatisticalService.java
 delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/IssueVoteDetailService.java
 delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/IssueVoteStatisticalDailyService.java
 delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/IssueVoteStatisticalService.java
 delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueCustomerParameterServiceImpl.java
 delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueProcessServiceImpl.java
 delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueProjectRelationServiceImpl.java
 delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueSatisfactionDetailServiceImpl.java
 delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueSatisfactionStatisticalServiceImpl.java
 delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueVoteDetailServiceImpl.java
 delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueVoteStatisticalDailyServiceImpl.java
 delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueVoteStatisticalServiceImpl.java
 delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/resources/mapper/IssueCustomerParameterDao.xml
 delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/resources/mapper/IssueProcessDao.xml
 delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/resources/mapper/IssueProjectRelationDao.xml
 delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/resources/mapper/IssueSatisfactionDetailDao.xml
 delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/resources/mapper/IssueSatisfactionStatisticalDao.xml
 delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/resources/mapper/IssueVoteDetailDao.xml
 delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/resources/mapper/IssueVoteStatisticalDailyDao.xml
 delete mode 100644 epmet-module/resi-hall/resi-hall-server/src/main/resources/mapper/IssueVoteStatisticalDao.xml
 create mode 100644 epmet-module/resi-hall/resi-hall.iml

diff --git a/epmet-module/resi-hall/resi-hall-client/resi-hall-client.iml b/epmet-module/resi-hall/resi-hall-client/resi-hall-client.iml
new file mode 100644
index 0000000000..f1936e17be
--- /dev/null
+++ b/epmet-module/resi-hall/resi-hall-client/resi-hall-client.iml
@@ -0,0 +1,145 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="Spring" name="Spring">
+      <configuration />
+    </facet>
+  </component>
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
+    <output url="file://$MODULE_DIR$/target/classes" />
+    <output-test url="file://$MODULE_DIR$/target/test-classes" />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <excludeFolder url="file://$MODULE_DIR$/target" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="epmet-commons-tools" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-aop:2.1.11.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-aop:5.1.12.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.9.5" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-openfeign:2.1.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter:2.1.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-context:2.1.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.security:spring-security-rsa:1.0.7.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.bouncycastle:bcpkix-jdk15on:1.60" level="project" />
+    <orderEntry type="library" name="Maven: org.bouncycastle:bcprov-jdk15on:1.60" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-openfeign-core:2.1.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-netflix-ribbon:2.1.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-netflix-archaius:2.1.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: io.github.openfeign.form:feign-form-spring:3.8.0" level="project" />
+    <orderEntry type="library" name="Maven: io.github.openfeign.form:feign-form:3.8.0" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-web:5.1.12.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-commons:2.1.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.security:spring-security-crypto:5.1.7.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: io.github.openfeign:feign-core:10.4.0" level="project" />
+    <orderEntry type="library" name="Maven: io.github.openfeign:feign-slf4j:10.4.0" level="project" />
+    <orderEntry type="library" name="Maven: io.github.openfeign:feign-hystrix:10.4.0" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.archaius:archaius-core:0.7.6" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.google.code.findbugs:jsr305:3.0.1" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: commons-configuration:commons-configuration:1.8" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: commons-lang:commons-lang:2.6" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.hystrix:hystrix-core:1.5.18" level="project" />
+    <orderEntry type="library" name="Maven: io.reactivex:rxjava:1.3.8" level="project" />
+    <orderEntry type="library" name="Maven: org.hdrhistogram:HdrHistogram:2.1.9" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-data-redis:2.1.11.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-redis:2.1.14.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-keyvalue:2.1.14.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-commons:2.1.14.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-tx:5.1.12.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-oxm:5.1.12.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context-support:5.1.12.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: io.lettuce:lettuce-core:5.1.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-common:4.1.43.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-handler:4.1.43.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-buffer:4.1.43.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-codec:4.1.43.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-transport:4.1.43.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-resolver:4.1.43.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.projectreactor:reactor-core:3.2.13.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.reactivestreams:reactive-streams:1.0.3" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.9.10.1" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.9.10" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.9.10" level="project" />
+    <orderEntry type="library" name="Maven: org.hibernate.validator:hibernate-validator:6.0.18.Final" level="project" />
+    <orderEntry type="library" name="Maven: javax.validation:validation-api:2.0.1.Final" level="project" />
+    <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.3.3.Final" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.8.1" level="project" />
+    <orderEntry type="library" name="Maven: commons-fileupload:commons-fileupload:1.3.3" level="project" />
+    <orderEntry type="library" name="Maven: commons-io:commons-io:2.6" level="project" />
+    <orderEntry type="library" name="Maven: cn.hutool:hutool-all:4.6.1" level="project" />
+    <orderEntry type="library" name="Maven: cn.afterturn:easypoi-base:4.1.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.poi:poi:4.1.0" level="project" />
+    <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.11" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-collections4:4.3" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-math3:3.6.1" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml:4.1.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-compress:1.18" level="project" />
+    <orderEntry type="library" name="Maven: com.github.virtuald:curvesapi:1.06" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml-schemas:4.1.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.xmlbeans:xmlbeans:3.1.0" level="project" />
+    <orderEntry type="library" name="Maven: ognl:ognl:3.2.6" level="project" />
+    <orderEntry type="library" name="Maven: org.javassist:javassist:3.20.0-GA" level="project" />
+    <orderEntry type="library" name="Maven: cn.afterturn:easypoi-annotation:4.1.0" level="project" />
+    <orderEntry type="library" name="Maven: cn.afterturn:easypoi-web:4.1.0" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:5.1.12.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-expression:5.1.12.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: joda-time:joda-time:2.10.5" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.60" level="project" />
+    <orderEntry type="library" name="Maven: com.google.code.gson:gson:2.8.6" level="project" />
+    <orderEntry type="library" name="Maven: org.jsoup:jsoup:1.11.3" level="project" />
+    <orderEntry type="library" name="Maven: org.projectlombok:lombok:1.18.10" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger2:2.7.0" level="project" />
+    <orderEntry type="library" name="Maven: io.swagger:swagger-annotations:1.5.13" level="project" />
+    <orderEntry type="library" name="Maven: io.swagger:swagger-models:1.5.13" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-spi:2.7.0" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-core:2.7.0" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-schema:2.7.0" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger-common:2.7.0" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-spring-web:2.7.0" level="project" />
+    <orderEntry type="library" name="Maven: org.reflections:reflections:0.9.11" level="project" />
+    <orderEntry type="library" name="Maven: com.google.guava:guava:18.0" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml:classmate:1.4.0" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.29" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-core:1.2.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-beans:5.1.12.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context:5.1.12.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-metadata:1.2.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.mapstruct:mapstruct:1.1.0.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger-ui:2.7.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-starter-test:2.1.11.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.1.11.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.1.11.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.1.11.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.1.11.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.2.3" level="project" />
+    <orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.2.3" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-to-slf4j:2.11.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.11.2" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.29" level="project" />
+    <orderEntry type="library" name="Maven: javax.annotation:javax.annotation-api:1.3.2" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: org.yaml:snakeyaml:1.23" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test:2.1.11.RELEASE" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test-autoconfigure:2.1.11.RELEASE" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: com.jayway.jsonpath:json-path:2.4.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: net.minidev:json-smart:2.3" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: net.minidev:accessors-smart:1.2" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.ow2.asm:asm:5.0.4" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.assertj:assertj-core:3.11.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-core:2.23.4" level="project" />
+    <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy:1.9.16" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: net.bytebuddy:byte-buddy-agent:1.9.16" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.objenesis:objenesis:2.6" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-library:1.3" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.skyscreamer:jsonassert:1.5.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: com.vaadin.external.google:android-json:0.0.20131108.vaadin1" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-core:5.1.12.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.1.12.RELEASE" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.springframework:spring-test:5.1.12.RELEASE" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.xmlunit:xmlunit-core:2.6.3" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: javax.xml.bind:jaxb-api:2.3.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: javax.activation:javax.activation-api:1.2.0" level="project" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/epmet-module/resi-hall/resi-hall-server/resi-hall-server.iml b/epmet-module/resi-hall/resi-hall-server/resi-hall-server.iml
new file mode 100644
index 0000000000..9b122af4a2
--- /dev/null
+++ b/epmet-module/resi-hall/resi-hall-server/resi-hall-server.iml
@@ -0,0 +1,196 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="Spring" name="Spring">
+      <configuration />
+    </facet>
+    <facet type="web" name="Web">
+      <configuration>
+        <webroots />
+      </configuration>
+    </facet>
+  </component>
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
+    <output url="file://$MODULE_DIR$/target/classes" />
+    <output-test url="file://$MODULE_DIR$/target/test-classes" />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
+      <excludeFolder url="file://$MODULE_DIR$/target" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="resi-hall-client" />
+    <orderEntry type="module" module-name="epmet-commons-tools" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-aop:2.1.11.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.9.5" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-openfeign:2.1.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter:2.1.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.security:spring-security-rsa:1.0.7.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.bouncycastle:bcpkix-jdk15on:1.60" level="project" />
+    <orderEntry type="library" name="Maven: org.bouncycastle:bcprov-jdk15on:1.60" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-openfeign-core:2.1.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: io.github.openfeign.form:feign-form-spring:3.8.0" level="project" />
+    <orderEntry type="library" name="Maven: io.github.openfeign.form:feign-form:3.8.0" level="project" />
+    <orderEntry type="library" name="Maven: io.github.openfeign:feign-slf4j:10.4.0" level="project" />
+    <orderEntry type="library" name="Maven: io.github.openfeign:feign-hystrix:10.4.0" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.archaius:archaius-core:0.7.6" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.google.code.findbugs:jsr305:3.0.1" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.hystrix:hystrix-core:1.5.18" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-data-redis:2.1.11.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-redis:2.1.14.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-keyvalue:2.1.14.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-commons:2.1.14.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-tx:5.1.12.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-oxm:5.1.12.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: io.lettuce:lettuce-core:5.1.8.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-common:4.1.43.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-handler:4.1.43.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-buffer:4.1.43.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-codec:4.1.43.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-transport:4.1.43.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-resolver:4.1.43.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.projectreactor:reactor-core:3.2.13.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.reactivestreams:reactive-streams:1.0.3" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.9.10.1" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.9.10" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.9.10" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.8.1" level="project" />
+    <orderEntry type="library" name="Maven: commons-fileupload:commons-fileupload:1.3.3" level="project" />
+    <orderEntry type="library" name="Maven: commons-io:commons-io:2.6" level="project" />
+    <orderEntry type="library" name="Maven: cn.hutool:hutool-all:4.6.1" level="project" />
+    <orderEntry type="library" name="Maven: cn.afterturn:easypoi-base:4.1.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.poi:poi:4.1.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-collections4:4.3" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-math3:3.6.1" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml:4.1.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-compress:1.18" level="project" />
+    <orderEntry type="library" name="Maven: com.github.virtuald:curvesapi:1.06" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml-schemas:4.1.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.xmlbeans:xmlbeans:3.1.0" level="project" />
+    <orderEntry type="library" name="Maven: ognl:ognl:3.2.6" level="project" />
+    <orderEntry type="library" name="Maven: org.javassist:javassist:3.20.0-GA" level="project" />
+    <orderEntry type="library" name="Maven: cn.afterturn:easypoi-annotation:4.1.0" level="project" />
+    <orderEntry type="library" name="Maven: cn.afterturn:easypoi-web:4.1.0" level="project" />
+    <orderEntry type="library" name="Maven: joda-time:joda-time:2.10.5" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.60" level="project" />
+    <orderEntry type="library" name="Maven: com.google.code.gson:gson:2.8.6" level="project" />
+    <orderEntry type="library" name="Maven: org.jsoup:jsoup:1.11.3" level="project" />
+    <orderEntry type="library" name="Maven: org.projectlombok:lombok:1.18.10" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger2:2.7.0" level="project" />
+    <orderEntry type="library" name="Maven: io.swagger:swagger-annotations:1.5.13" level="project" />
+    <orderEntry type="library" name="Maven: io.swagger:swagger-models:1.5.13" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-spi:2.7.0" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-core:2.7.0" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-schema:2.7.0" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger-common:2.7.0" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-spring-web:2.7.0" level="project" />
+    <orderEntry type="library" name="Maven: org.reflections:reflections:0.9.11" level="project" />
+    <orderEntry type="library" name="Maven: com.google.guava:guava:18.0" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml:classmate:1.4.0" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.29" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-core:1.2.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-metadata:1.2.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.mapstruct:mapstruct:1.1.0.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger-ui:2.7.0" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:2.1.11.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.1.11.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.1.11.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.1.11.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.1.11.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.2.3" level="project" />
+    <orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.2.3" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-to-slf4j:2.11.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.11.2" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.29" level="project" />
+    <orderEntry type="library" name="Maven: javax.annotation:javax.annotation-api:1.3.2" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: org.yaml:snakeyaml:1.23" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-json:2.1.11.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.9.10" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.9.10" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.module:jackson-module-parameter-names:2.9.10" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-tomcat:2.1.11.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-core:9.0.29" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-el:9.0.29" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:9.0.29" level="project" />
+    <orderEntry type="library" name="Maven: org.hibernate.validator:hibernate-validator:6.0.18.Final" level="project" />
+    <orderEntry type="library" name="Maven: javax.validation:validation-api:2.0.1.Final" level="project" />
+    <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.3.3.Final" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-web:5.1.12.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:5.1.12.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-aop:5.1.12.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-expression:5.1.12.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context-support:5.1.12.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-beans:5.1.12.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context:5.1.12.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-core:5.1.12.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.1.12.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-actuator:2.1.11.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-actuator-autoconfigure:2.1.11.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-actuator:2.1.11.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: io.micrometer:micrometer-core:1.1.9" level="project" />
+    <orderEntry type="library" name="Maven: org.hdrhistogram:HdrHistogram:2.1.9" level="project" />
+    <orderEntry type="library" name="Maven: org.latencyutils:LatencyUtils:2.0.3" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba.cloud:spring-cloud-starter-alibaba-nacos-discovery:2.1.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba.cloud:spring-cloud-alibaba-nacos-discovery:2.1.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba.nacos:nacos-client:1.1.1" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba.nacos:nacos-common:1.1.1" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba.nacos:nacos-api:1.1.1" level="project" />
+    <orderEntry type="library" name="Maven: io.prometheus:simpleclient:0.5.0" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-commons:2.1.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.security:spring-security-crypto:5.1.7.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-context:2.1.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-netflix-ribbon:2.1.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-netflix-ribbon:2.1.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-netflix-archaius:2.1.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-netflix-archaius:2.1.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: commons-configuration:commons-configuration:1.8" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.ribbon:ribbon:2.3.0" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.netflix.ribbon:ribbon-transport:2.3.0" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: io.reactivex:rxnetty-contexts:0.4.9" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: io.reactivex:rxnetty-servo:0.4.9" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: javax.inject:javax.inject:1" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: io.reactivex:rxnetty:0.4.9" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.ribbon:ribbon-core:2.3.0" level="project" />
+    <orderEntry type="library" name="Maven: commons-lang:commons-lang:2.6" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.ribbon:ribbon-httpclient:2.3.0" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: commons-collections:commons-collections:3.2.2" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.sun.jersey:jersey-client:1.19.1" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.sun.jersey:jersey-core:1.19.1" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: javax.ws.rs:jsr311-api:1.1.1" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.sun.jersey.contribs:jersey-apache-client4:1.19.1" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.netflix.servo:servo-core:0.12.21" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.netflix.netflix-commons:netflix-commons-util:0.3.0" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.ribbon:ribbon-loadbalancer:2.3.0" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.netflix.netflix-commons:netflix-statistics:0.1.1" level="project" />
+    <orderEntry type="library" name="Maven: io.reactivex:rxjava:1.3.8" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba.cloud:spring-cloud-starter-alibaba-nacos-config:2.1.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba.cloud:spring-cloud-alibaba-nacos-config:2.1.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: io.github.openfeign:feign-httpclient:10.3.0" level="project" />
+    <orderEntry type="library" name="Maven: io.github.openfeign:feign-core:10.4.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.10" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.12" level="project" />
+    <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.11" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-starter-test:2.1.11.RELEASE" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test:2.1.11.RELEASE" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test-autoconfigure:2.1.11.RELEASE" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: com.jayway.jsonpath:json-path:2.4.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: net.minidev:json-smart:2.3" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: net.minidev:accessors-smart:1.2" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.ow2.asm:asm:5.0.4" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.assertj:assertj-core:3.11.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-core:2.23.4" level="project" />
+    <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy:1.9.16" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: net.bytebuddy:byte-buddy-agent:1.9.16" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.objenesis:objenesis:2.6" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-library:1.3" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.skyscreamer:jsonassert:1.5.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: com.vaadin.external.google:android-json:0.0.20131108.vaadin1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.springframework:spring-test:5.1.12.RELEASE" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.xmlunit:xmlunit-core:2.6.3" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: javax.xml.bind:jaxb-api:2.3.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: javax.activation:javax.activation-api:1.2.0" level="project" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueCustomerParameterController.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueCustomerParameterController.java
deleted file mode 100644
index 7371c32666..0000000000
--- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueCustomerParameterController.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/**
- * 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.IssueCustomerParameterDTO;
-import com.epmet.excel.IssueCustomerParameterExcel;
-import com.epmet.service.IssueCustomerParameterService;
-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 2020-05-11
- */
-@RestController
-@RequestMapping("issuecustomerparameter")
-public class IssueCustomerParameterController {
-    
-    @Autowired
-    private IssueCustomerParameterService issueCustomerParameterService;
-
-    @GetMapping("page")
-    public Result<PageData<IssueCustomerParameterDTO>> page(@RequestParam Map<String, Object> params){
-        PageData<IssueCustomerParameterDTO> page = issueCustomerParameterService.page(params);
-        return new Result<PageData<IssueCustomerParameterDTO>>().ok(page);
-    }
-
-    @GetMapping("{id}")
-    public Result<IssueCustomerParameterDTO> get(@PathVariable("id") String id){
-        IssueCustomerParameterDTO data = issueCustomerParameterService.get(id);
-        return new Result<IssueCustomerParameterDTO>().ok(data);
-    }
-
-    @PostMapping
-    public Result save(@RequestBody IssueCustomerParameterDTO dto){
-        //效验数据
-        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
-        issueCustomerParameterService.save(dto);
-        return new Result();
-    }
-
-    @PutMapping
-    public Result update(@RequestBody IssueCustomerParameterDTO dto){
-        //效验数据
-        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
-        issueCustomerParameterService.update(dto);
-        return new Result();
-    }
-
-    @DeleteMapping
-    public Result delete(@RequestBody String[] ids){
-        //效验数据
-        AssertUtils.isArrayEmpty(ids, "id");
-        issueCustomerParameterService.delete(ids);
-        return new Result();
-    }
-
-    @GetMapping("export")
-    public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
-        List<IssueCustomerParameterDTO> list = issueCustomerParameterService.list(params);
-        ExcelUtils.exportExcelToTarget(response, null, list, IssueCustomerParameterExcel.class);
-    }
-
-}
\ No newline at end of file
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueProcessController.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueProcessController.java
deleted file mode 100644
index bf6c57f863..0000000000
--- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueProcessController.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/**
- * 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.IssueProcessDTO;
-import com.epmet.excel.IssueProcessExcel;
-import com.epmet.service.IssueProcessService;
-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 2020-05-11
- */
-@RestController
-@RequestMapping("issueprocess")
-public class IssueProcessController {
-    
-    @Autowired
-    private IssueProcessService issueProcessService;
-
-    @GetMapping("page")
-    public Result<PageData<IssueProcessDTO>> page(@RequestParam Map<String, Object> params){
-        PageData<IssueProcessDTO> page = issueProcessService.page(params);
-        return new Result<PageData<IssueProcessDTO>>().ok(page);
-    }
-
-    @GetMapping("{id}")
-    public Result<IssueProcessDTO> get(@PathVariable("id") String id){
-        IssueProcessDTO data = issueProcessService.get(id);
-        return new Result<IssueProcessDTO>().ok(data);
-    }
-
-    @PostMapping
-    public Result save(@RequestBody IssueProcessDTO dto){
-        //效验数据
-        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
-        issueProcessService.save(dto);
-        return new Result();
-    }
-
-    @PutMapping
-    public Result update(@RequestBody IssueProcessDTO dto){
-        //效验数据
-        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
-        issueProcessService.update(dto);
-        return new Result();
-    }
-
-    @DeleteMapping
-    public Result delete(@RequestBody String[] ids){
-        //效验数据
-        AssertUtils.isArrayEmpty(ids, "id");
-        issueProcessService.delete(ids);
-        return new Result();
-    }
-
-    @GetMapping("export")
-    public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
-        List<IssueProcessDTO> list = issueProcessService.list(params);
-        ExcelUtils.exportExcelToTarget(response, null, list, IssueProcessExcel.class);
-    }
-
-}
\ No newline at end of file
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueProjectRelationController.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueProjectRelationController.java
deleted file mode 100644
index 7efd1b1394..0000000000
--- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueProjectRelationController.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/**
- * 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.IssueProjectRelationDTO;
-import com.epmet.excel.IssueProjectRelationExcel;
-import com.epmet.service.IssueProjectRelationService;
-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 2020-05-11
- */
-@RestController
-@RequestMapping("issueprojectrelation")
-public class IssueProjectRelationController {
-    
-    @Autowired
-    private IssueProjectRelationService issueProjectRelationService;
-
-    @GetMapping("page")
-    public Result<PageData<IssueProjectRelationDTO>> page(@RequestParam Map<String, Object> params){
-        PageData<IssueProjectRelationDTO> page = issueProjectRelationService.page(params);
-        return new Result<PageData<IssueProjectRelationDTO>>().ok(page);
-    }
-
-    @GetMapping("{id}")
-    public Result<IssueProjectRelationDTO> get(@PathVariable("id") String id){
-        IssueProjectRelationDTO data = issueProjectRelationService.get(id);
-        return new Result<IssueProjectRelationDTO>().ok(data);
-    }
-
-    @PostMapping
-    public Result save(@RequestBody IssueProjectRelationDTO dto){
-        //效验数据
-        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
-        issueProjectRelationService.save(dto);
-        return new Result();
-    }
-
-    @PutMapping
-    public Result update(@RequestBody IssueProjectRelationDTO dto){
-        //效验数据
-        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
-        issueProjectRelationService.update(dto);
-        return new Result();
-    }
-
-    @DeleteMapping
-    public Result delete(@RequestBody String[] ids){
-        //效验数据
-        AssertUtils.isArrayEmpty(ids, "id");
-        issueProjectRelationService.delete(ids);
-        return new Result();
-    }
-
-    @GetMapping("export")
-    public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
-        List<IssueProjectRelationDTO> list = issueProjectRelationService.list(params);
-        ExcelUtils.exportExcelToTarget(response, null, list, IssueProjectRelationExcel.class);
-    }
-
-}
\ No newline at end of file
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueSatisfactionDetailController.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueSatisfactionDetailController.java
deleted file mode 100644
index 8772539ab3..0000000000
--- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueSatisfactionDetailController.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/**
- * 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.IssueSatisfactionDetailDTO;
-import com.epmet.excel.IssueSatisfactionDetailExcel;
-import com.epmet.service.IssueSatisfactionDetailService;
-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 2020-05-11
- */
-@RestController
-@RequestMapping("issuesatisfactiondetail")
-public class IssueSatisfactionDetailController {
-    
-    @Autowired
-    private IssueSatisfactionDetailService issueSatisfactionDetailService;
-
-    @GetMapping("page")
-    public Result<PageData<IssueSatisfactionDetailDTO>> page(@RequestParam Map<String, Object> params){
-        PageData<IssueSatisfactionDetailDTO> page = issueSatisfactionDetailService.page(params);
-        return new Result<PageData<IssueSatisfactionDetailDTO>>().ok(page);
-    }
-
-    @GetMapping("{id}")
-    public Result<IssueSatisfactionDetailDTO> get(@PathVariable("id") String id){
-        IssueSatisfactionDetailDTO data = issueSatisfactionDetailService.get(id);
-        return new Result<IssueSatisfactionDetailDTO>().ok(data);
-    }
-
-    @PostMapping
-    public Result save(@RequestBody IssueSatisfactionDetailDTO dto){
-        //效验数据
-        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
-        issueSatisfactionDetailService.save(dto);
-        return new Result();
-    }
-
-    @PutMapping
-    public Result update(@RequestBody IssueSatisfactionDetailDTO dto){
-        //效验数据
-        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
-        issueSatisfactionDetailService.update(dto);
-        return new Result();
-    }
-
-    @DeleteMapping
-    public Result delete(@RequestBody String[] ids){
-        //效验数据
-        AssertUtils.isArrayEmpty(ids, "id");
-        issueSatisfactionDetailService.delete(ids);
-        return new Result();
-    }
-
-    @GetMapping("export")
-    public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
-        List<IssueSatisfactionDetailDTO> list = issueSatisfactionDetailService.list(params);
-        ExcelUtils.exportExcelToTarget(response, null, list, IssueSatisfactionDetailExcel.class);
-    }
-
-}
\ No newline at end of file
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueSatisfactionStatisticalController.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueSatisfactionStatisticalController.java
deleted file mode 100644
index f9412e0996..0000000000
--- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueSatisfactionStatisticalController.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/**
- * 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.IssueSatisfactionStatisticalDTO;
-import com.epmet.excel.IssueSatisfactionStatisticalExcel;
-import com.epmet.service.IssueSatisfactionStatisticalService;
-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 2020-05-11
- */
-@RestController
-@RequestMapping("issuesatisfactionstatistical")
-public class IssueSatisfactionStatisticalController {
-    
-    @Autowired
-    private IssueSatisfactionStatisticalService issueSatisfactionStatisticalService;
-
-    @GetMapping("page")
-    public Result<PageData<IssueSatisfactionStatisticalDTO>> page(@RequestParam Map<String, Object> params){
-        PageData<IssueSatisfactionStatisticalDTO> page = issueSatisfactionStatisticalService.page(params);
-        return new Result<PageData<IssueSatisfactionStatisticalDTO>>().ok(page);
-    }
-
-    @GetMapping("{id}")
-    public Result<IssueSatisfactionStatisticalDTO> get(@PathVariable("id") String id){
-        IssueSatisfactionStatisticalDTO data = issueSatisfactionStatisticalService.get(id);
-        return new Result<IssueSatisfactionStatisticalDTO>().ok(data);
-    }
-
-    @PostMapping
-    public Result save(@RequestBody IssueSatisfactionStatisticalDTO dto){
-        //效验数据
-        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
-        issueSatisfactionStatisticalService.save(dto);
-        return new Result();
-    }
-
-    @PutMapping
-    public Result update(@RequestBody IssueSatisfactionStatisticalDTO dto){
-        //效验数据
-        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
-        issueSatisfactionStatisticalService.update(dto);
-        return new Result();
-    }
-
-    @DeleteMapping
-    public Result delete(@RequestBody String[] ids){
-        //效验数据
-        AssertUtils.isArrayEmpty(ids, "id");
-        issueSatisfactionStatisticalService.delete(ids);
-        return new Result();
-    }
-
-    @GetMapping("export")
-    public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
-        List<IssueSatisfactionStatisticalDTO> list = issueSatisfactionStatisticalService.list(params);
-        ExcelUtils.exportExcelToTarget(response, null, list, IssueSatisfactionStatisticalExcel.class);
-    }
-
-}
\ No newline at end of file
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueVoteDetailController.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueVoteDetailController.java
deleted file mode 100644
index 981aacf50e..0000000000
--- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueVoteDetailController.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/**
- * 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.IssueVoteDetailDTO;
-import com.epmet.excel.IssueVoteDetailExcel;
-import com.epmet.service.IssueVoteDetailService;
-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 2020-05-11
- */
-@RestController
-@RequestMapping("issuevotedetail")
-public class IssueVoteDetailController {
-    
-    @Autowired
-    private IssueVoteDetailService issueVoteDetailService;
-
-    @GetMapping("page")
-    public Result<PageData<IssueVoteDetailDTO>> page(@RequestParam Map<String, Object> params){
-        PageData<IssueVoteDetailDTO> page = issueVoteDetailService.page(params);
-        return new Result<PageData<IssueVoteDetailDTO>>().ok(page);
-    }
-
-    @GetMapping("{id}")
-    public Result<IssueVoteDetailDTO> get(@PathVariable("id") String id){
-        IssueVoteDetailDTO data = issueVoteDetailService.get(id);
-        return new Result<IssueVoteDetailDTO>().ok(data);
-    }
-
-    @PostMapping
-    public Result save(@RequestBody IssueVoteDetailDTO dto){
-        //效验数据
-        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
-        issueVoteDetailService.save(dto);
-        return new Result();
-    }
-
-    @PutMapping
-    public Result update(@RequestBody IssueVoteDetailDTO dto){
-        //效验数据
-        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
-        issueVoteDetailService.update(dto);
-        return new Result();
-    }
-
-    @DeleteMapping
-    public Result delete(@RequestBody String[] ids){
-        //效验数据
-        AssertUtils.isArrayEmpty(ids, "id");
-        issueVoteDetailService.delete(ids);
-        return new Result();
-    }
-
-    @GetMapping("export")
-    public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
-        List<IssueVoteDetailDTO> list = issueVoteDetailService.list(params);
-        ExcelUtils.exportExcelToTarget(response, null, list, IssueVoteDetailExcel.class);
-    }
-
-}
\ No newline at end of file
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueVoteStatisticalController.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueVoteStatisticalController.java
deleted file mode 100644
index ab98b72498..0000000000
--- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueVoteStatisticalController.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/**
- * 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.IssueVoteStatisticalDTO;
-import com.epmet.excel.IssueVoteStatisticalExcel;
-import com.epmet.service.IssueVoteStatisticalService;
-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 2020-05-11
- */
-@RestController
-@RequestMapping("issuevotestatistical")
-public class IssueVoteStatisticalController {
-    
-    @Autowired
-    private IssueVoteStatisticalService issueVoteStatisticalService;
-
-    @GetMapping("page")
-    public Result<PageData<IssueVoteStatisticalDTO>> page(@RequestParam Map<String, Object> params){
-        PageData<IssueVoteStatisticalDTO> page = issueVoteStatisticalService.page(params);
-        return new Result<PageData<IssueVoteStatisticalDTO>>().ok(page);
-    }
-
-    @GetMapping("{id}")
-    public Result<IssueVoteStatisticalDTO> get(@PathVariable("id") String id){
-        IssueVoteStatisticalDTO data = issueVoteStatisticalService.get(id);
-        return new Result<IssueVoteStatisticalDTO>().ok(data);
-    }
-
-    @PostMapping
-    public Result save(@RequestBody IssueVoteStatisticalDTO dto){
-        //效验数据
-        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
-        issueVoteStatisticalService.save(dto);
-        return new Result();
-    }
-
-    @PutMapping
-    public Result update(@RequestBody IssueVoteStatisticalDTO dto){
-        //效验数据
-        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
-        issueVoteStatisticalService.update(dto);
-        return new Result();
-    }
-
-    @DeleteMapping
-    public Result delete(@RequestBody String[] ids){
-        //效验数据
-        AssertUtils.isArrayEmpty(ids, "id");
-        issueVoteStatisticalService.delete(ids);
-        return new Result();
-    }
-
-    @GetMapping("export")
-    public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
-        List<IssueVoteStatisticalDTO> list = issueVoteStatisticalService.list(params);
-        ExcelUtils.exportExcelToTarget(response, null, list, IssueVoteStatisticalExcel.class);
-    }
-
-}
\ No newline at end of file
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueVoteStatisticalDailyController.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueVoteStatisticalDailyController.java
deleted file mode 100644
index 7e5506354a..0000000000
--- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueVoteStatisticalDailyController.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/**
- * 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.IssueVoteStatisticalDailyDTO;
-import com.epmet.excel.IssueVoteStatisticalDailyExcel;
-import com.epmet.service.IssueVoteStatisticalDailyService;
-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 2020-05-11
- */
-@RestController
-@RequestMapping("issuevotestatisticaldaily")
-public class IssueVoteStatisticalDailyController {
-    
-    @Autowired
-    private IssueVoteStatisticalDailyService issueVoteStatisticalDailyService;
-
-    @GetMapping("page")
-    public Result<PageData<IssueVoteStatisticalDailyDTO>> page(@RequestParam Map<String, Object> params){
-        PageData<IssueVoteStatisticalDailyDTO> page = issueVoteStatisticalDailyService.page(params);
-        return new Result<PageData<IssueVoteStatisticalDailyDTO>>().ok(page);
-    }
-
-    @GetMapping("{id}")
-    public Result<IssueVoteStatisticalDailyDTO> get(@PathVariable("id") String id){
-        IssueVoteStatisticalDailyDTO data = issueVoteStatisticalDailyService.get(id);
-        return new Result<IssueVoteStatisticalDailyDTO>().ok(data);
-    }
-
-    @PostMapping
-    public Result save(@RequestBody IssueVoteStatisticalDailyDTO dto){
-        //效验数据
-        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
-        issueVoteStatisticalDailyService.save(dto);
-        return new Result();
-    }
-
-    @PutMapping
-    public Result update(@RequestBody IssueVoteStatisticalDailyDTO dto){
-        //效验数据
-        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
-        issueVoteStatisticalDailyService.update(dto);
-        return new Result();
-    }
-
-    @DeleteMapping
-    public Result delete(@RequestBody String[] ids){
-        //效验数据
-        AssertUtils.isArrayEmpty(ids, "id");
-        issueVoteStatisticalDailyService.delete(ids);
-        return new Result();
-    }
-
-    @GetMapping("export")
-    public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
-        List<IssueVoteStatisticalDailyDTO> list = issueVoteStatisticalDailyService.list(params);
-        ExcelUtils.exportExcelToTarget(response, null, list, IssueVoteStatisticalDailyExcel.class);
-    }
-
-}
\ No newline at end of file
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/ResiHallDemoController.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/ResiHallDemoController.java
deleted file mode 100644
index 56c01421a7..0000000000
--- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/ResiHallDemoController.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.epmet.controller;
-
-import com.epmet.commons.tools.utils.Result;
-import com.epmet.commons.tools.validator.ValidatorUtils;
-import com.epmet.dto.form.DemoTestFormDTO;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.web.bind.annotation.*;
-
-/**
- * @Description 测试
- * @Author yinzuomei
- * @Date 2020/5/7 22:47
- */
-@RestController
-@RequestMapping("demo")
-public class ResiHallDemoController {
-    private static final Logger logger = LoggerFactory.getLogger(ResiHallDemoController.class);
-
-    @PostMapping("test")
-    public Result test(@RequestBody DemoTestFormDTO formDTO) {
-        logger.info(String.format("请求成功客户id[%s],网格id[%s]",formDTO.getCustomerId(),formDTO.getGridId()));
-        ValidatorUtils.validateEntity(formDTO);
-        return new Result().ok("resi-hall-server请求成功");
-    }
-}
-
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/dao/IssueCustomerParameterDao.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/dao/IssueCustomerParameterDao.java
deleted file mode 100644
index 48fa1e3491..0000000000
--- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/dao/IssueCustomerParameterDao.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/**
- * 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.IssueCustomerParameterEntity;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * 议题客户参数定制表
- *
- * @author generator generator@elink-cn.com
- * @since v1.0.0 2020-05-11
- */
-@Mapper
-public interface IssueCustomerParameterDao extends BaseDao<IssueCustomerParameterEntity> {
-	
-}
\ No newline at end of file
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/dao/IssueDao.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/dao/IssueDao.java
deleted file mode 100644
index 8f390edc63..0000000000
--- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/dao/IssueDao.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/**
- * 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.dto.form.IssueDetailFormDTO;
-import com.epmet.dto.result.IssueDetailResultDTO;
-import com.epmet.entity.IssueEntity;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * 议题详情 关联话题，转议题时间必须要和话题转议题时间一致、关闭时间必须要和操作记录表的关闭记录时间一致、转项目时间必须要和项目记录生成时间一致，注意服务间调用的时间一致性。每个议题最后总会被关闭。
- *
- * @author generator generator@elink-cn.com
- * @since v1.0.0 2020-05-11
- */
-@Mapper
-public interface IssueDao extends BaseDao<IssueEntity> {
-
-    /**
-     * @Description  议题详情
-     * @param formDTO
-     * @author zxc
-     * @date 2020/5/11 10:11
-     */
-    IssueDetailResultDTO issueDetail(IssueDetailFormDTO formDTO);
-
-}
\ No newline at end of file
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/dao/IssueProcessDao.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/dao/IssueProcessDao.java
deleted file mode 100644
index 26603169ae..0000000000
--- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/dao/IssueProcessDao.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/**
- * 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.IssueProcessEntity;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * 议题进展记录表
- *
- * @author generator generator@elink-cn.com
- * @since v1.0.0 2020-05-11
- */
-@Mapper
-public interface IssueProcessDao extends BaseDao<IssueProcessEntity> {
-	
-}
\ No newline at end of file
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/dao/IssueProjectRelationDao.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/dao/IssueProjectRelationDao.java
deleted file mode 100644
index 430dc74741..0000000000
--- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/dao/IssueProjectRelationDao.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/**
- * 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.IssueProjectRelationEntity;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * 议题项目关系表
- *
- * @author generator generator@elink-cn.com
- * @since v1.0.0 2020-05-11
- */
-@Mapper
-public interface IssueProjectRelationDao extends BaseDao<IssueProjectRelationEntity> {
-	
-}
\ No newline at end of file
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/dao/IssueSatisfactionDetailDao.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/dao/IssueSatisfactionDetailDao.java
deleted file mode 100644
index 01727f507a..0000000000
--- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/dao/IssueSatisfactionDetailDao.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/**
- * 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.IssueSatisfactionDetailEntity;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * 议题满意度调查记录表
- *
- * @author generator generator@elink-cn.com
- * @since v1.0.0 2020-05-11
- */
-@Mapper
-public interface IssueSatisfactionDetailDao extends BaseDao<IssueSatisfactionDetailEntity> {
-	
-}
\ No newline at end of file
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/dao/IssueSatisfactionStatisticalDao.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/dao/IssueSatisfactionStatisticalDao.java
deleted file mode 100644
index e3eeabb823..0000000000
--- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/dao/IssueSatisfactionStatisticalDao.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/**
- * 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.IssueSatisfactionStatisticalEntity;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * 议题满意度调查统计表
- *
- * @author generator generator@elink-cn.com
- * @since v1.0.0 2020-05-11
- */
-@Mapper
-public interface IssueSatisfactionStatisticalDao extends BaseDao<IssueSatisfactionStatisticalEntity> {
-	
-}
\ No newline at end of file
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/dao/IssueVoteDetailDao.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/dao/IssueVoteDetailDao.java
deleted file mode 100644
index f8a41e3747..0000000000
--- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/dao/IssueVoteDetailDao.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/**
- * 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.IssueVoteDetailEntity;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * 议题表决记录表
- *
- * @author generator generator@elink-cn.com
- * @since v1.0.0 2020-05-11
- */
-@Mapper
-public interface IssueVoteDetailDao extends BaseDao<IssueVoteDetailEntity> {
-	
-}
\ No newline at end of file
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/dao/IssueVoteStatisticalDailyDao.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/dao/IssueVoteStatisticalDailyDao.java
deleted file mode 100644
index e09695b2b8..0000000000
--- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/dao/IssueVoteStatisticalDailyDao.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/**
- * 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.IssueVoteStatisticalDailyEntity;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * 议题表决按天统计表
- *
- * @author generator generator@elink-cn.com
- * @since v1.0.0 2020-05-11
- */
-@Mapper
-public interface IssueVoteStatisticalDailyDao extends BaseDao<IssueVoteStatisticalDailyEntity> {
-	
-}
\ No newline at end of file
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/dao/IssueVoteStatisticalDao.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/dao/IssueVoteStatisticalDao.java
deleted file mode 100644
index 7f833487d8..0000000000
--- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/dao/IssueVoteStatisticalDao.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/**
- * 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.IssueVoteStatisticalEntity;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * 议题表决统计表
- *
- * @author generator generator@elink-cn.com
- * @since v1.0.0 2020-05-11
- */
-@Mapper
-public interface IssueVoteStatisticalDao extends BaseDao<IssueVoteStatisticalEntity> {
-	
-}
\ No newline at end of file
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/entity/IssueCustomerParameterEntity.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/entity/IssueCustomerParameterEntity.java
deleted file mode 100644
index 72e7769da7..0000000000
--- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/entity/IssueCustomerParameterEntity.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/**
- * 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 2020-05-11
- */
-@Data
-@EqualsAndHashCode(callSuper=false)
-@TableName("issue_customer_parameter")
-public class IssueCustomerParameterEntity extends BaseEpmetEntity {
-
-	private static final long serialVersionUID = 1L;
-
-    /**
-     * 客户ID
-     */
-	private String customerId;
-
-    /**
-     * 参数键 eg:voting_time_limit
-     */
-	private String parameterKey;
-
-    /**
-     * 参数名 eg:表决期限
-     */
-	private String parameterName;
-
-    /**
-     * 参数值 eg:10（天）
-     */
-	private String parameterValue;
-
-    /**
-     * 参数说明 eg:这个客户下所有的网格议题表决期限都是10天
-     */
-	private String description;
-
-}
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/entity/IssueEntity.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/entity/IssueEntity.java
deleted file mode 100644
index cfa9b8c046..0000000000
--- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/entity/IssueEntity.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/**
- * 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 2020-05-11
- */
-@Data
-@EqualsAndHashCode(callSuper=false)
-@TableName("issue")
-public class IssueEntity extends BaseEpmetEntity {
-
-	private static final long serialVersionUID = 1L;
-
-    /**
-     * 议题状态 表决中：voting 已转项目：shift_project 已关闭：closed
-     */
-	private String issueStatus;
-
-    /**
-     * 来源类型 eg:resi_topic
-     */
-	private String sourceType;
-
-    /**
-     * 来源ID eg:2223232(当SOURCE_TYPE为"resi_topic"时，这里指话题的ID)
-     */
-	private String sourceId;
-
-    /**
-     * 关闭理由 【未关闭时可以为空】关闭话题时必填的理由，转项目后而且已经结案，这个字段不回写
-     */
-	private String closeReason;
-
-    /**
-     * 解决类型 【未关闭时可以为空】已解决resloved、未解决unresloved，对应在关闭议题时所选的checkbox，转项目后而且已经结案，这个字段不回写
-     */
-	private String resolveType;
-
-    /**
-     * 议题名称 最多20字
-     */
-	private String issueTitle;
-
-    /**
-     * 建议 建议
-     */
-	private String suggestion;
-
-    /**
-     * 客户ID 客户ID
-     */
-	private String customerId;
-
-    /**
-     * 网格ID 居民端议题对应一个网格iId
-     */
-	private String gridId;
-
-    /**
-     * 所属机关 【数据权限-非必填】11:22:33(agencyId)数据权限控制
-     */
-	private String orgIdPath;
-
-    /**
-     * 组织ID 【数据权限-非必填】agencyId
-     */
-	private String orgId;
-
-    /**
-     * 表决截止日期 表决截止日期
-     */
-	private Date votingDeadline;
-
-    /**
-     * 表决发起日期（转议题日期） 表决发起日期（转议题日期）
-     */
-	private Date decidedTime;
-
-    /**
-     * 转项目日期 转项目日期（服务间调用日期一致性）
-     */
-	private Date shiftedTime;
-
-    /**
-     * 关闭日期 关闭日期
-     */
-	private Date closedTime;
-
-}
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/entity/IssueProcessEntity.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/entity/IssueProcessEntity.java
deleted file mode 100644
index 701a3c6c61..0000000000
--- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/entity/IssueProcessEntity.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/**
- * 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 2020-05-11
- */
-@Data
-@EqualsAndHashCode(callSuper=false)
-@TableName("issue_process")
-public class IssueProcessEntity extends BaseEpmetEntity {
-
-	private static final long serialVersionUID = 1L;
-
-    /**
-     * 议题ID
-     */
-	private String issueId;
-
-    /**
-     * 操作状态 - 表决中：voting 已转项目：shift_project 已关闭：closed
-     */
-	private String issueStatus;
-
-    /**
-     * 组织类型 操作人所属机构类型（机构：agency | 部门：dept | 网格：grid）操作人可能来源于居民端和政府段，但是只有在“转议题”的时候才是居民端拥有组长权限的人操作，所以当这条记录是转议题时，该记录为grid，ORD_ID相应的也为GRID_ID
-     */
-	private String orgType;
-
-    /**
-     * 组织ID 操作人所属机构ID（对应的有网格ID、部门ID、机构ID）
-     */
-	private String orgId;
-
-    /**
-     * 操作说明 (节点的说明文案，包含三个节点的文案说明【转议题】、【已关闭】、【转项目】)
-     */
-	private String operationExplain;
-
-}
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/entity/IssueProjectRelationEntity.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/entity/IssueProjectRelationEntity.java
deleted file mode 100644
index c1fcf5f579..0000000000
--- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/entity/IssueProjectRelationEntity.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/**
- * 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 2020-05-11
- */
-@Data
-@EqualsAndHashCode(callSuper=false)
-@TableName("issue_project_relation")
-public class IssueProjectRelationEntity extends BaseEpmetEntity {
-
-	private static final long serialVersionUID = 1L;
-
-    /**
-     * 议题ID 议题ID
-     */
-	private String issueId;
-
-    /**
-     * 项目ID 项目ID
-     */
-	private String projectId;
-
-}
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/entity/IssueSatisfactionDetailEntity.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/entity/IssueSatisfactionDetailEntity.java
deleted file mode 100644
index d36fdababc..0000000000
--- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/entity/IssueSatisfactionDetailEntity.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/**
- * 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 2020-05-11
- */
-@Data
-@EqualsAndHashCode(callSuper=false)
-@TableName("issue_satisfaction_detail")
-public class IssueSatisfactionDetailEntity extends BaseEpmetEntity {
-
-	private static final long serialVersionUID = 1L;
-
-    /**
-     * 议题ID
-     */
-	private String issueId;
-
-    /**
-     * 评论 - 最多300字
-     */
-	private String comment;
-
-    /**
-     * 满意度 满意度 - 不满意:bad、基本满意:good、非常满意:perfect
-     */
-	private String satisfaction;
-
-}
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/entity/IssueSatisfactionStatisticalEntity.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/entity/IssueSatisfactionStatisticalEntity.java
deleted file mode 100644
index 243b1e441a..0000000000
--- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/entity/IssueSatisfactionStatisticalEntity.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/**
- * 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 2020-05-11
- */
-@Data
-@EqualsAndHashCode(callSuper=false)
-@TableName("issue_satisfaction_statistical")
-public class IssueSatisfactionStatisticalEntity extends BaseEpmetEntity {
-
-	private static final long serialVersionUID = 1L;
-
-    /**
-     * 议题ID
-     */
-	private String issueId;
-
-    /**
-     * 一般满意数
-     */
-	private Integer goodCount;
-
-    /**
-     * 非常满意数
-     */
-	private Integer perfectCount;
-
-    /**
-     * 不满意数
-     */
-	private Integer badCount;
-
-}
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/entity/IssueVoteDetailEntity.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/entity/IssueVoteDetailEntity.java
deleted file mode 100644
index 1f3381b687..0000000000
--- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/entity/IssueVoteDetailEntity.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/**
- * 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 2020-05-11
- */
-@Data
-@EqualsAndHashCode(callSuper=false)
-@TableName("issue_vote_detail")
-public class IssueVoteDetailEntity extends BaseEpmetEntity {
-
-	private static final long serialVersionUID = 1L;
-
-    /**
-     * 议题ID
-     */
-	private String issueId;
-
-    /**
-     * 态度 - opposition（反对）support（赞成）
-     */
-	private String attitude;
-
-}
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/entity/IssueVoteStatisticalDailyEntity.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/entity/IssueVoteStatisticalDailyEntity.java
deleted file mode 100644
index 92feff0236..0000000000
--- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/entity/IssueVoteStatisticalDailyEntity.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/**
- * 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 2020-05-11
- */
-@Data
-@EqualsAndHashCode(callSuper=false)
-@TableName("issue_vote_statistical_daily")
-public class IssueVoteStatisticalDailyEntity extends BaseEpmetEntity {
-
-	private static final long serialVersionUID = 1L;
-
-    /**
-     * 议题ID
-     */
-	private String issueId;
-
-    /**
-     * 统计日期 yyyy-MM-dd
-     */
-	private Date statisticalDate;
-
-    /**
-     * 到该日的总赞成数
-     */
-	private Integer supportCount;
-
-    /**
-     * 到该日的总反对数
-     */
-	private Integer oppositionCount;
-
-    /**
-     * 到该日的总票数
-     */
-	private Integer totalCount;
-
-    /**
-     * 该日增量
-     */
-	private Integer todayIncrement;
-
-    /**
-     * 该日赞成增量
-     */
-	private Integer supportIncrement;
-
-    /**
-     * 该日反对增量
-     */
-	private Integer oppositionIncrement;
-
-    /**
-     * 到该日的应表决数
-     */
-	private Integer votableCount;
-
-}
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/entity/IssueVoteStatisticalEntity.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/entity/IssueVoteStatisticalEntity.java
deleted file mode 100644
index d287eddf27..0000000000
--- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/entity/IssueVoteStatisticalEntity.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/**
- * 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 2020-05-11
- */
-@Data
-@EqualsAndHashCode(callSuper=false)
-@TableName("issue_vote_statistical")
-public class IssueVoteStatisticalEntity extends BaseEpmetEntity {
-
-	private static final long serialVersionUID = 1L;
-
-    /**
-     * 议题ID
-     */
-	private String issueId;
-
-    /**
-     * 支持数
-     */
-	private Integer supportCount;
-
-    /**
-     * 反对数
-     */
-	private Integer oppositionCount;
-
-    /**
-     * 应表决数
-     */
-	private Integer votableCount;
-
-}
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/excel/IssueCustomerParameterExcel.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/excel/IssueCustomerParameterExcel.java
deleted file mode 100644
index 9ede57879c..0000000000
--- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/excel/IssueCustomerParameterExcel.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/**
- * 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 2020-05-11
- */
-@Data
-public class IssueCustomerParameterExcel {
-
-    @Excel(name = "主键ID")
-    private String id;
-
-    @Excel(name = "客户ID")
-    private String customerId;
-
-    @Excel(name = "参数键 eg:voting_time_limit")
-    private String parameterKey;
-
-    @Excel(name = "参数名 eg:表决期限")
-    private String parameterName;
-
-    @Excel(name = "参数值 eg:10（天）")
-    private String parameterValue;
-
-    @Excel(name = "参数说明 eg:这个客户下所有的网格议题表决期限都是10天")
-    private String description;
-
-    @Excel(name = "删除标志 0：未删除，1：已删除")
-    private String 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/resi-hall/resi-hall-server/src/main/java/com/epmet/excel/IssueExcel.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/excel/IssueExcel.java
deleted file mode 100644
index f7df76d076..0000000000
--- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/excel/IssueExcel.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/**
- * 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 2020-05-11
- */
-@Data
-public class IssueExcel {
-
-    @Excel(name = "议题ID")
-    private String id;
-
-    @Excel(name = "议题状态 表决中：voting 已转项目：shift_project 已关闭：closed")
-    private String issueStatus;
-
-    @Excel(name = "来源类型 eg:resi_topic")
-    private String sourceType;
-
-    @Excel(name = "来源ID eg:2223232(当SOURCE_TYPE为\"resi_topic\"时，这里指话题的ID)")
-    private String sourceId;
-
-    @Excel(name = "关闭理由 【未关闭时可以为空】关闭议题时必填的理由，转项目后而且已经结案，这个字段不回写")
-    private String closeReason;
-
-    @Excel(name = "解决类型 【未关闭时可以为空】已解决resloved、未解决unresloved，对应在关闭议题时所选的checkbox，转项目后而且已经结案，这个字段不回写")
-    private String resolveType;
-
-    @Excel(name = "议题名称 最多20字")
-    private String issueTitle;
-
-    @Excel(name = "建议 最多1000字")
-    private String suggestion;
-
-    @Excel(name = "客户ID")
-    private String customerId;
-
-    @Excel(name = "网格ID 居民端议题对应一个网格Id")
-    private String gridId;
-
-    @Excel(name = "所属机关 【数据权限-非必填】11:22:33(agencyId)数据权限控制")
-    private String orgIdPath;
-
-    @Excel(name = "组织ID 【数据权限-非必填】agencyId")
-    private String orgId;
-
-    @Excel(name = "表决截止日期")
-    private Date votingDeadline;
-
-    @Excel(name = "表决发起日期（转议题日期）")
-    private Date decidedTime;
-
-    @Excel(name = "转项目日期 （服务间调用日期一致性）")
-    private Date shiftedTime;
-
-    @Excel(name = "关闭日期")
-    private Date closedTime;
-
-    @Excel(name = "删除标识 0未删除、1已删除")
-    private String 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/resi-hall/resi-hall-server/src/main/java/com/epmet/excel/IssueProcessExcel.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/excel/IssueProcessExcel.java
deleted file mode 100644
index 587e28e8c2..0000000000
--- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/excel/IssueProcessExcel.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/**
- * 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 2020-05-11
- */
-@Data
-public class IssueProcessExcel {
-
-    @Excel(name = "主键ID")
-    private String id;
-
-    @Excel(name = "议题ID")
-    private String issueId;
-
-    @Excel(name = "操作状态 - 表决中：voting 已转项目：shift_project 已关闭：closed")
-    private String issueStatus;
-
-    @Excel(name = "组织类型 操作人所属机构类型（机构：agency | 部门：dept | 网格：grid）操作人可能来源于居民端和政府段，但是只有在“转议题”的时候才是居民端拥有组长权限的人操作，所以当这条记录是转议题时，该记录为grid，ORD_ID相应的也为GRID_ID")
-    private String orgType;
-
-    @Excel(name = "组织ID 操作人所属机构ID（对应的有网格ID、部门ID、机构ID）")
-    private String orgId;
-
-    @Excel(name = "操作说明 (节点的说明文案，包含三个节点的文案说明【转议题】、【已关闭】、【转项目】)")
-    private String operationExplain;
-
-    @Excel(name = "删除标识 0未删除、1已删除")
-    private String 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/resi-hall/resi-hall-server/src/main/java/com/epmet/excel/IssueProjectRelationExcel.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/excel/IssueProjectRelationExcel.java
deleted file mode 100644
index 620eee36c1..0000000000
--- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/excel/IssueProjectRelationExcel.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/**
- * 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 2020-05-11
- */
-@Data
-public class IssueProjectRelationExcel {
-
-    @Excel(name = "主键ID 主键ID")
-    private String id;
-
-    @Excel(name = "议题ID 议题ID")
-    private String issueId;
-
-    @Excel(name = "项目ID 项目ID")
-    private String projectId;
-
-    @Excel(name = "删除标识 0：未删除1：已删除")
-    private String 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/resi-hall/resi-hall-server/src/main/java/com/epmet/excel/IssueSatisfactionDetailExcel.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/excel/IssueSatisfactionDetailExcel.java
deleted file mode 100644
index 804d0bbacc..0000000000
--- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/excel/IssueSatisfactionDetailExcel.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/**
- * 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 2020-05-11
- */
-@Data
-public class IssueSatisfactionDetailExcel {
-
-    @Excel(name = "主键ID")
-    private String id;
-
-    @Excel(name = "议题ID")
-    private String issueId;
-
-    @Excel(name = "评论 - 最多300字")
-    private String comment;
-
-    @Excel(name = "满意度 满意度 - 不满意:bad、基本满意:good、非常满意:perfect")
-    private String satisfaction;
-
-    @Excel(name = "删除标识 0未删除、1已删除")
-    private String 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/resi-hall/resi-hall-server/src/main/java/com/epmet/excel/IssueSatisfactionStatisticalExcel.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/excel/IssueSatisfactionStatisticalExcel.java
deleted file mode 100644
index be2b748413..0000000000
--- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/excel/IssueSatisfactionStatisticalExcel.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/**
- * 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 2020-05-11
- */
-@Data
-public class IssueSatisfactionStatisticalExcel {
-
-    @Excel(name = "主键ID")
-    private String id;
-
-    @Excel(name = "议题ID")
-    private String issueId;
-
-    @Excel(name = "一般满意数")
-    private Integer goodCount;
-
-    @Excel(name = "非常满意数")
-    private Integer perfectCount;
-
-    @Excel(name = "不满意数")
-    private Integer badCount;
-
-    @Excel(name = "删除标识 0未删除、1已删除")
-    private String 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/resi-hall/resi-hall-server/src/main/java/com/epmet/excel/IssueVoteDetailExcel.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/excel/IssueVoteDetailExcel.java
deleted file mode 100644
index 5ea0c106a3..0000000000
--- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/excel/IssueVoteDetailExcel.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/**
- * 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 2020-05-11
- */
-@Data
-public class IssueVoteDetailExcel {
-
-    @Excel(name = "主键ID")
-    private String id;
-
-    @Excel(name = "议题ID")
-    private String issueId;
-
-    @Excel(name = "态度 - opposition（反对）support（赞成）")
-    private String attitude;
-
-    @Excel(name = "删除标识 0未删除、1已删除")
-    private String 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/resi-hall/resi-hall-server/src/main/java/com/epmet/excel/IssueVoteStatisticalDailyExcel.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/excel/IssueVoteStatisticalDailyExcel.java
deleted file mode 100644
index deafe9f0b9..0000000000
--- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/excel/IssueVoteStatisticalDailyExcel.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/**
- * 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 2020-05-11
- */
-@Data
-public class IssueVoteStatisticalDailyExcel {
-
-    @Excel(name = "主键ID")
-    private String id;
-
-    @Excel(name = "议题ID")
-    private String issueId;
-
-    @Excel(name = "统计日期 yyyy-MM-dd")
-    private Date statisticalDate;
-
-    @Excel(name = "到该日的总赞成数")
-    private Integer supportCount;
-
-    @Excel(name = "到该日的总反对数")
-    private Integer oppositionCount;
-
-    @Excel(name = "到该日的总票数")
-    private Integer totalCount;
-
-    @Excel(name = "该日增量")
-    private Integer todayIncrement;
-
-    @Excel(name = "该日赞成增量")
-    private Integer supportIncrement;
-
-    @Excel(name = "该日反对增量")
-    private Integer oppositionIncrement;
-
-    @Excel(name = "到该日的应表决数")
-    private Integer votableCount;
-
-    @Excel(name = "删除标识 0未删除、1已删除")
-    private String 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/resi-hall/resi-hall-server/src/main/java/com/epmet/excel/IssueVoteStatisticalExcel.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/excel/IssueVoteStatisticalExcel.java
deleted file mode 100644
index ffa83424a8..0000000000
--- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/excel/IssueVoteStatisticalExcel.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/**
- * 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 2020-05-11
- */
-@Data
-public class IssueVoteStatisticalExcel {
-
-    @Excel(name = "主键ID")
-    private String id;
-
-    @Excel(name = "议题ID")
-    private String issueId;
-
-    @Excel(name = "支持数")
-    private Integer supportCount;
-
-    @Excel(name = "反对数")
-    private Integer oppositionCount;
-
-    @Excel(name = "应表决数")
-    private Integer votableCount;
-
-    @Excel(name = "乐观锁")
-    private Integer revision;
-
-    @Excel(name = "删除标识 0未删除、1已删除")
-    private String delFlag;
-
-    @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/resi-hall/resi-hall-server/src/main/java/com/epmet/redis/IssueCustomerParameterRedis.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/redis/IssueCustomerParameterRedis.java
deleted file mode 100644
index 1152ccab05..0000000000
--- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/redis/IssueCustomerParameterRedis.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/**
- * 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 2020-05-11
- */
-@Component
-public class IssueCustomerParameterRedis {
-    @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-module/resi-hall/resi-hall-server/src/main/java/com/epmet/redis/IssueProcessRedis.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/redis/IssueProcessRedis.java
deleted file mode 100644
index d550f5bf5e..0000000000
--- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/redis/IssueProcessRedis.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/**
- * 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 2020-05-11
- */
-@Component
-public class IssueProcessRedis {
-    @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-module/resi-hall/resi-hall-server/src/main/java/com/epmet/redis/IssueProjectRelationRedis.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/redis/IssueProjectRelationRedis.java
deleted file mode 100644
index 75ec7d9d0d..0000000000
--- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/redis/IssueProjectRelationRedis.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/**
- * 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 2020-05-11
- */
-@Component
-public class IssueProjectRelationRedis {
-    @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-module/resi-hall/resi-hall-server/src/main/java/com/epmet/redis/IssueRedis.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/redis/IssueRedis.java
deleted file mode 100644
index cfed63cb4d..0000000000
--- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/redis/IssueRedis.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/**
- * 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 2020-05-11
- */
-@Component
-public class IssueRedis {
-    @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-module/resi-hall/resi-hall-server/src/main/java/com/epmet/redis/IssueSatisfactionDetailRedis.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/redis/IssueSatisfactionDetailRedis.java
deleted file mode 100644
index 706304b1ff..0000000000
--- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/redis/IssueSatisfactionDetailRedis.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/**
- * 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 2020-05-11
- */
-@Component
-public class IssueSatisfactionDetailRedis {
-    @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-module/resi-hall/resi-hall-server/src/main/java/com/epmet/redis/IssueSatisfactionStatisticalRedis.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/redis/IssueSatisfactionStatisticalRedis.java
deleted file mode 100644
index 6d5d8ec0dc..0000000000
--- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/redis/IssueSatisfactionStatisticalRedis.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/**
- * 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 2020-05-11
- */
-@Component
-public class IssueSatisfactionStatisticalRedis {
-    @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-module/resi-hall/resi-hall-server/src/main/java/com/epmet/redis/IssueVoteDetailRedis.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/redis/IssueVoteDetailRedis.java
deleted file mode 100644
index 89c8f04994..0000000000
--- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/redis/IssueVoteDetailRedis.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/**
- * 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 2020-05-11
- */
-@Component
-public class IssueVoteDetailRedis {
-    @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-module/resi-hall/resi-hall-server/src/main/java/com/epmet/redis/IssueVoteStatisticalDailyRedis.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/redis/IssueVoteStatisticalDailyRedis.java
deleted file mode 100644
index 852ff4a3e7..0000000000
--- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/redis/IssueVoteStatisticalDailyRedis.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/**
- * 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 2020-05-11
- */
-@Component
-public class IssueVoteStatisticalDailyRedis {
-    @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-module/resi-hall/resi-hall-server/src/main/java/com/epmet/redis/IssueVoteStatisticalRedis.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/redis/IssueVoteStatisticalRedis.java
deleted file mode 100644
index c9c928f08f..0000000000
--- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/redis/IssueVoteStatisticalRedis.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/**
- * 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 2020-05-11
- */
-@Component
-public class IssueVoteStatisticalRedis {
-    @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-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/IssueCustomerParameterService.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/IssueCustomerParameterService.java
deleted file mode 100644
index 941d8efde9..0000000000
--- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/IssueCustomerParameterService.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/**
- * 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.IssueCustomerParameterDTO;
-import com.epmet.entity.IssueCustomerParameterEntity;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * 议题客户参数定制表
- *
- * @author generator generator@elink-cn.com
- * @since v1.0.0 2020-05-11
- */
-public interface IssueCustomerParameterService extends BaseService<IssueCustomerParameterEntity> {
-
-    /**
-     * 默认分页
-     *
-     * @param params
-     * @return PageData<IssueCustomerParameterDTO>
-     * @author generator
-     * @date 2020-05-11
-     */
-    PageData<IssueCustomerParameterDTO> page(Map<String, Object> params);
-
-    /**
-     * 默认查询
-     *
-     * @param params
-     * @return java.util.List<IssueCustomerParameterDTO>
-     * @author generator
-     * @date 2020-05-11
-     */
-    List<IssueCustomerParameterDTO> list(Map<String, Object> params);
-
-    /**
-     * 单条查询
-     *
-     * @param id
-     * @return IssueCustomerParameterDTO
-     * @author generator
-     * @date 2020-05-11
-     */
-    IssueCustomerParameterDTO get(String id);
-
-    /**
-     * 默认保存
-     *
-     * @param dto
-     * @return void
-     * @author generator
-     * @date 2020-05-11
-     */
-    void save(IssueCustomerParameterDTO dto);
-
-    /**
-     * 默认更新
-     *
-     * @param dto
-     * @return void
-     * @author generator
-     * @date 2020-05-11
-     */
-    void update(IssueCustomerParameterDTO dto);
-
-    /**
-     * 批量删除
-     *
-     * @param ids
-     * @return void
-     * @author generator
-     * @date 2020-05-11
-     */
-    void delete(String[] ids);
-}
\ No newline at end of file
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/IssueProcessService.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/IssueProcessService.java
deleted file mode 100644
index fa285655aa..0000000000
--- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/IssueProcessService.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/**
- * 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.IssueProcessDTO;
-import com.epmet.entity.IssueProcessEntity;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * 议题进展记录表
- *
- * @author generator generator@elink-cn.com
- * @since v1.0.0 2020-05-11
- */
-public interface IssueProcessService extends BaseService<IssueProcessEntity> {
-
-    /**
-     * 默认分页
-     *
-     * @param params
-     * @return PageData<IssueProcessDTO>
-     * @author generator
-     * @date 2020-05-11
-     */
-    PageData<IssueProcessDTO> page(Map<String, Object> params);
-
-    /**
-     * 默认查询
-     *
-     * @param params
-     * @return java.util.List<IssueProcessDTO>
-     * @author generator
-     * @date 2020-05-11
-     */
-    List<IssueProcessDTO> list(Map<String, Object> params);
-
-    /**
-     * 单条查询
-     *
-     * @param id
-     * @return IssueProcessDTO
-     * @author generator
-     * @date 2020-05-11
-     */
-    IssueProcessDTO get(String id);
-
-    /**
-     * 默认保存
-     *
-     * @param dto
-     * @return void
-     * @author generator
-     * @date 2020-05-11
-     */
-    void save(IssueProcessDTO dto);
-
-    /**
-     * 默认更新
-     *
-     * @param dto
-     * @return void
-     * @author generator
-     * @date 2020-05-11
-     */
-    void update(IssueProcessDTO dto);
-
-    /**
-     * 批量删除
-     *
-     * @param ids
-     * @return void
-     * @author generator
-     * @date 2020-05-11
-     */
-    void delete(String[] ids);
-}
\ No newline at end of file
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/IssueProjectRelationService.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/IssueProjectRelationService.java
deleted file mode 100644
index 1381151c65..0000000000
--- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/IssueProjectRelationService.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/**
- * 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.IssueProjectRelationDTO;
-import com.epmet.entity.IssueProjectRelationEntity;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * 议题项目关系表
- *
- * @author generator generator@elink-cn.com
- * @since v1.0.0 2020-05-11
- */
-public interface IssueProjectRelationService extends BaseService<IssueProjectRelationEntity> {
-
-    /**
-     * 默认分页
-     *
-     * @param params
-     * @return PageData<IssueProjectRelationDTO>
-     * @author generator
-     * @date 2020-05-11
-     */
-    PageData<IssueProjectRelationDTO> page(Map<String, Object> params);
-
-    /**
-     * 默认查询
-     *
-     * @param params
-     * @return java.util.List<IssueProjectRelationDTO>
-     * @author generator
-     * @date 2020-05-11
-     */
-    List<IssueProjectRelationDTO> list(Map<String, Object> params);
-
-    /**
-     * 单条查询
-     *
-     * @param id
-     * @return IssueProjectRelationDTO
-     * @author generator
-     * @date 2020-05-11
-     */
-    IssueProjectRelationDTO get(String id);
-
-    /**
-     * 默认保存
-     *
-     * @param dto
-     * @return void
-     * @author generator
-     * @date 2020-05-11
-     */
-    void save(IssueProjectRelationDTO dto);
-
-    /**
-     * 默认更新
-     *
-     * @param dto
-     * @return void
-     * @author generator
-     * @date 2020-05-11
-     */
-    void update(IssueProjectRelationDTO dto);
-
-    /**
-     * 批量删除
-     *
-     * @param ids
-     * @return void
-     * @author generator
-     * @date 2020-05-11
-     */
-    void delete(String[] ids);
-}
\ No newline at end of file
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/IssueSatisfactionDetailService.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/IssueSatisfactionDetailService.java
deleted file mode 100644
index ab47a3797a..0000000000
--- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/IssueSatisfactionDetailService.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/**
- * 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.IssueSatisfactionDetailDTO;
-import com.epmet.entity.IssueSatisfactionDetailEntity;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * 议题满意度调查记录表
- *
- * @author generator generator@elink-cn.com
- * @since v1.0.0 2020-05-11
- */
-public interface IssueSatisfactionDetailService extends BaseService<IssueSatisfactionDetailEntity> {
-
-    /**
-     * 默认分页
-     *
-     * @param params
-     * @return PageData<IssueSatisfactionDetailDTO>
-     * @author generator
-     * @date 2020-05-11
-     */
-    PageData<IssueSatisfactionDetailDTO> page(Map<String, Object> params);
-
-    /**
-     * 默认查询
-     *
-     * @param params
-     * @return java.util.List<IssueSatisfactionDetailDTO>
-     * @author generator
-     * @date 2020-05-11
-     */
-    List<IssueSatisfactionDetailDTO> list(Map<String, Object> params);
-
-    /**
-     * 单条查询
-     *
-     * @param id
-     * @return IssueSatisfactionDetailDTO
-     * @author generator
-     * @date 2020-05-11
-     */
-    IssueSatisfactionDetailDTO get(String id);
-
-    /**
-     * 默认保存
-     *
-     * @param dto
-     * @return void
-     * @author generator
-     * @date 2020-05-11
-     */
-    void save(IssueSatisfactionDetailDTO dto);
-
-    /**
-     * 默认更新
-     *
-     * @param dto
-     * @return void
-     * @author generator
-     * @date 2020-05-11
-     */
-    void update(IssueSatisfactionDetailDTO dto);
-
-    /**
-     * 批量删除
-     *
-     * @param ids
-     * @return void
-     * @author generator
-     * @date 2020-05-11
-     */
-    void delete(String[] ids);
-}
\ No newline at end of file
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/IssueSatisfactionStatisticalService.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/IssueSatisfactionStatisticalService.java
deleted file mode 100644
index 0d21c0cc99..0000000000
--- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/IssueSatisfactionStatisticalService.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/**
- * 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.IssueSatisfactionStatisticalDTO;
-import com.epmet.entity.IssueSatisfactionStatisticalEntity;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * 议题满意度调查统计表
- *
- * @author generator generator@elink-cn.com
- * @since v1.0.0 2020-05-11
- */
-public interface IssueSatisfactionStatisticalService extends BaseService<IssueSatisfactionStatisticalEntity> {
-
-    /**
-     * 默认分页
-     *
-     * @param params
-     * @return PageData<IssueSatisfactionStatisticalDTO>
-     * @author generator
-     * @date 2020-05-11
-     */
-    PageData<IssueSatisfactionStatisticalDTO> page(Map<String, Object> params);
-
-    /**
-     * 默认查询
-     *
-     * @param params
-     * @return java.util.List<IssueSatisfactionStatisticalDTO>
-     * @author generator
-     * @date 2020-05-11
-     */
-    List<IssueSatisfactionStatisticalDTO> list(Map<String, Object> params);
-
-    /**
-     * 单条查询
-     *
-     * @param id
-     * @return IssueSatisfactionStatisticalDTO
-     * @author generator
-     * @date 2020-05-11
-     */
-    IssueSatisfactionStatisticalDTO get(String id);
-
-    /**
-     * 默认保存
-     *
-     * @param dto
-     * @return void
-     * @author generator
-     * @date 2020-05-11
-     */
-    void save(IssueSatisfactionStatisticalDTO dto);
-
-    /**
-     * 默认更新
-     *
-     * @param dto
-     * @return void
-     * @author generator
-     * @date 2020-05-11
-     */
-    void update(IssueSatisfactionStatisticalDTO dto);
-
-    /**
-     * 批量删除
-     *
-     * @param ids
-     * @return void
-     * @author generator
-     * @date 2020-05-11
-     */
-    void delete(String[] ids);
-}
\ No newline at end of file
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/IssueVoteDetailService.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/IssueVoteDetailService.java
deleted file mode 100644
index 36f3e0579c..0000000000
--- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/IssueVoteDetailService.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/**
- * 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.IssueVoteDetailDTO;
-import com.epmet.entity.IssueVoteDetailEntity;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * 议题表决记录表
- *
- * @author generator generator@elink-cn.com
- * @since v1.0.0 2020-05-11
- */
-public interface IssueVoteDetailService extends BaseService<IssueVoteDetailEntity> {
-
-    /**
-     * 默认分页
-     *
-     * @param params
-     * @return PageData<IssueVoteDetailDTO>
-     * @author generator
-     * @date 2020-05-11
-     */
-    PageData<IssueVoteDetailDTO> page(Map<String, Object> params);
-
-    /**
-     * 默认查询
-     *
-     * @param params
-     * @return java.util.List<IssueVoteDetailDTO>
-     * @author generator
-     * @date 2020-05-11
-     */
-    List<IssueVoteDetailDTO> list(Map<String, Object> params);
-
-    /**
-     * 单条查询
-     *
-     * @param id
-     * @return IssueVoteDetailDTO
-     * @author generator
-     * @date 2020-05-11
-     */
-    IssueVoteDetailDTO get(String id);
-
-    /**
-     * 默认保存
-     *
-     * @param dto
-     * @return void
-     * @author generator
-     * @date 2020-05-11
-     */
-    void save(IssueVoteDetailDTO dto);
-
-    /**
-     * 默认更新
-     *
-     * @param dto
-     * @return void
-     * @author generator
-     * @date 2020-05-11
-     */
-    void update(IssueVoteDetailDTO dto);
-
-    /**
-     * 批量删除
-     *
-     * @param ids
-     * @return void
-     * @author generator
-     * @date 2020-05-11
-     */
-    void delete(String[] ids);
-}
\ No newline at end of file
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/IssueVoteStatisticalDailyService.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/IssueVoteStatisticalDailyService.java
deleted file mode 100644
index c40851887d..0000000000
--- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/IssueVoteStatisticalDailyService.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/**
- * 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.IssueVoteStatisticalDailyDTO;
-import com.epmet.entity.IssueVoteStatisticalDailyEntity;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * 议题表决按天统计表
- *
- * @author generator generator@elink-cn.com
- * @since v1.0.0 2020-05-11
- */
-public interface IssueVoteStatisticalDailyService extends BaseService<IssueVoteStatisticalDailyEntity> {
-
-    /**
-     * 默认分页
-     *
-     * @param params
-     * @return PageData<IssueVoteStatisticalDailyDTO>
-     * @author generator
-     * @date 2020-05-11
-     */
-    PageData<IssueVoteStatisticalDailyDTO> page(Map<String, Object> params);
-
-    /**
-     * 默认查询
-     *
-     * @param params
-     * @return java.util.List<IssueVoteStatisticalDailyDTO>
-     * @author generator
-     * @date 2020-05-11
-     */
-    List<IssueVoteStatisticalDailyDTO> list(Map<String, Object> params);
-
-    /**
-     * 单条查询
-     *
-     * @param id
-     * @return IssueVoteStatisticalDailyDTO
-     * @author generator
-     * @date 2020-05-11
-     */
-    IssueVoteStatisticalDailyDTO get(String id);
-
-    /**
-     * 默认保存
-     *
-     * @param dto
-     * @return void
-     * @author generator
-     * @date 2020-05-11
-     */
-    void save(IssueVoteStatisticalDailyDTO dto);
-
-    /**
-     * 默认更新
-     *
-     * @param dto
-     * @return void
-     * @author generator
-     * @date 2020-05-11
-     */
-    void update(IssueVoteStatisticalDailyDTO dto);
-
-    /**
-     * 批量删除
-     *
-     * @param ids
-     * @return void
-     * @author generator
-     * @date 2020-05-11
-     */
-    void delete(String[] ids);
-}
\ No newline at end of file
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/IssueVoteStatisticalService.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/IssueVoteStatisticalService.java
deleted file mode 100644
index 4d54243be0..0000000000
--- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/IssueVoteStatisticalService.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/**
- * 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.IssueVoteStatisticalDTO;
-import com.epmet.entity.IssueVoteStatisticalEntity;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * 议题表决统计表
- *
- * @author generator generator@elink-cn.com
- * @since v1.0.0 2020-05-11
- */
-public interface IssueVoteStatisticalService extends BaseService<IssueVoteStatisticalEntity> {
-
-    /**
-     * 默认分页
-     *
-     * @param params
-     * @return PageData<IssueVoteStatisticalDTO>
-     * @author generator
-     * @date 2020-05-11
-     */
-    PageData<IssueVoteStatisticalDTO> page(Map<String, Object> params);
-
-    /**
-     * 默认查询
-     *
-     * @param params
-     * @return java.util.List<IssueVoteStatisticalDTO>
-     * @author generator
-     * @date 2020-05-11
-     */
-    List<IssueVoteStatisticalDTO> list(Map<String, Object> params);
-
-    /**
-     * 单条查询
-     *
-     * @param id
-     * @return IssueVoteStatisticalDTO
-     * @author generator
-     * @date 2020-05-11
-     */
-    IssueVoteStatisticalDTO get(String id);
-
-    /**
-     * 默认保存
-     *
-     * @param dto
-     * @return void
-     * @author generator
-     * @date 2020-05-11
-     */
-    void save(IssueVoteStatisticalDTO dto);
-
-    /**
-     * 默认更新
-     *
-     * @param dto
-     * @return void
-     * @author generator
-     * @date 2020-05-11
-     */
-    void update(IssueVoteStatisticalDTO dto);
-
-    /**
-     * 批量删除
-     *
-     * @param ids
-     * @return void
-     * @author generator
-     * @date 2020-05-11
-     */
-    void delete(String[] ids);
-}
\ No newline at end of file
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueCustomerParameterServiceImpl.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueCustomerParameterServiceImpl.java
deleted file mode 100644
index 1a751ab574..0000000000
--- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueCustomerParameterServiceImpl.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/**
- * 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.IssueCustomerParameterDao;
-import com.epmet.dto.IssueCustomerParameterDTO;
-import com.epmet.entity.IssueCustomerParameterEntity;
-import com.epmet.service.IssueCustomerParameterService;
-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 2020-05-11
- */
-@Service
-public class IssueCustomerParameterServiceImpl extends BaseServiceImpl<IssueCustomerParameterDao, IssueCustomerParameterEntity> implements IssueCustomerParameterService {
-
-    @Override
-    public PageData<IssueCustomerParameterDTO> page(Map<String, Object> params) {
-        IPage<IssueCustomerParameterEntity> page = baseDao.selectPage(
-                getPage(params, FieldConstant.CREATED_TIME, false),
-                getWrapper(params)
-        );
-        return getPageData(page, IssueCustomerParameterDTO.class);
-    }
-
-    @Override
-    public List<IssueCustomerParameterDTO> list(Map<String, Object> params) {
-        List<IssueCustomerParameterEntity> entityList = baseDao.selectList(getWrapper(params));
-
-        return ConvertUtils.sourceToTarget(entityList, IssueCustomerParameterDTO.class);
-    }
-
-    private QueryWrapper<IssueCustomerParameterEntity> getWrapper(Map<String, Object> params){
-        String id = (String)params.get(FieldConstant.ID_HUMP);
-
-        QueryWrapper<IssueCustomerParameterEntity> wrapper = new QueryWrapper<>();
-        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
-
-        return wrapper;
-    }
-
-    @Override
-    public IssueCustomerParameterDTO get(String id) {
-        IssueCustomerParameterEntity entity = baseDao.selectById(id);
-        return ConvertUtils.sourceToTarget(entity, IssueCustomerParameterDTO.class);
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public void save(IssueCustomerParameterDTO dto) {
-        IssueCustomerParameterEntity entity = ConvertUtils.sourceToTarget(dto, IssueCustomerParameterEntity.class);
-        insert(entity);
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public void update(IssueCustomerParameterDTO dto) {
-        IssueCustomerParameterEntity entity = ConvertUtils.sourceToTarget(dto, IssueCustomerParameterEntity.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/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueProcessServiceImpl.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueProcessServiceImpl.java
deleted file mode 100644
index fad2ebfb01..0000000000
--- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueProcessServiceImpl.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/**
- * 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.IssueProcessDao;
-import com.epmet.dto.IssueProcessDTO;
-import com.epmet.entity.IssueProcessEntity;
-import com.epmet.redis.IssueProcessRedis;
-import com.epmet.service.IssueProcessService;
-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 2020-05-11
- */
-@Service
-public class IssueProcessServiceImpl extends BaseServiceImpl<IssueProcessDao, IssueProcessEntity> implements IssueProcessService {
-
-    @Autowired
-    private IssueProcessRedis issueProcessRedis;
-
-    @Override
-    public PageData<IssueProcessDTO> page(Map<String, Object> params) {
-        IPage<IssueProcessEntity> page = baseDao.selectPage(
-                getPage(params, FieldConstant.CREATED_TIME, false),
-                getWrapper(params)
-        );
-        return getPageData(page, IssueProcessDTO.class);
-    }
-
-    @Override
-    public List<IssueProcessDTO> list(Map<String, Object> params) {
-        List<IssueProcessEntity> entityList = baseDao.selectList(getWrapper(params));
-
-        return ConvertUtils.sourceToTarget(entityList, IssueProcessDTO.class);
-    }
-
-    private QueryWrapper<IssueProcessEntity> getWrapper(Map<String, Object> params){
-        String id = (String)params.get(FieldConstant.ID_HUMP);
-
-        QueryWrapper<IssueProcessEntity> wrapper = new QueryWrapper<>();
-        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
-
-        return wrapper;
-    }
-
-    @Override
-    public IssueProcessDTO get(String id) {
-        IssueProcessEntity entity = baseDao.selectById(id);
-        return ConvertUtils.sourceToTarget(entity, IssueProcessDTO.class);
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public void save(IssueProcessDTO dto) {
-        IssueProcessEntity entity = ConvertUtils.sourceToTarget(dto, IssueProcessEntity.class);
-        insert(entity);
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public void update(IssueProcessDTO dto) {
-        IssueProcessEntity entity = ConvertUtils.sourceToTarget(dto, IssueProcessEntity.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/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueProjectRelationServiceImpl.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueProjectRelationServiceImpl.java
deleted file mode 100644
index 2b40a83079..0000000000
--- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueProjectRelationServiceImpl.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/**
- * 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.IssueProjectRelationDao;
-import com.epmet.dto.IssueProjectRelationDTO;
-import com.epmet.entity.IssueProjectRelationEntity;
-import com.epmet.redis.IssueProjectRelationRedis;
-import com.epmet.service.IssueProjectRelationService;
-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 2020-05-11
- */
-@Service
-public class IssueProjectRelationServiceImpl extends BaseServiceImpl<IssueProjectRelationDao, IssueProjectRelationEntity> implements IssueProjectRelationService {
-
-    @Autowired
-    private IssueProjectRelationRedis issueProjectRelationRedis;
-
-    @Override
-    public PageData<IssueProjectRelationDTO> page(Map<String, Object> params) {
-        IPage<IssueProjectRelationEntity> page = baseDao.selectPage(
-                getPage(params, FieldConstant.CREATED_TIME, false),
-                getWrapper(params)
-        );
-        return getPageData(page, IssueProjectRelationDTO.class);
-    }
-
-    @Override
-    public List<IssueProjectRelationDTO> list(Map<String, Object> params) {
-        List<IssueProjectRelationEntity> entityList = baseDao.selectList(getWrapper(params));
-
-        return ConvertUtils.sourceToTarget(entityList, IssueProjectRelationDTO.class);
-    }
-
-    private QueryWrapper<IssueProjectRelationEntity> getWrapper(Map<String, Object> params){
-        String id = (String)params.get(FieldConstant.ID_HUMP);
-
-        QueryWrapper<IssueProjectRelationEntity> wrapper = new QueryWrapper<>();
-        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
-
-        return wrapper;
-    }
-
-    @Override
-    public IssueProjectRelationDTO get(String id) {
-        IssueProjectRelationEntity entity = baseDao.selectById(id);
-        return ConvertUtils.sourceToTarget(entity, IssueProjectRelationDTO.class);
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public void save(IssueProjectRelationDTO dto) {
-        IssueProjectRelationEntity entity = ConvertUtils.sourceToTarget(dto, IssueProjectRelationEntity.class);
-        insert(entity);
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public void update(IssueProjectRelationDTO dto) {
-        IssueProjectRelationEntity entity = ConvertUtils.sourceToTarget(dto, IssueProjectRelationEntity.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/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueSatisfactionDetailServiceImpl.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueSatisfactionDetailServiceImpl.java
deleted file mode 100644
index 5662e355c4..0000000000
--- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueSatisfactionDetailServiceImpl.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/**
- * 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.IssueSatisfactionDetailDao;
-import com.epmet.dto.IssueSatisfactionDetailDTO;
-import com.epmet.entity.IssueSatisfactionDetailEntity;
-import com.epmet.redis.IssueSatisfactionDetailRedis;
-import com.epmet.service.IssueSatisfactionDetailService;
-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 2020-05-11
- */
-@Service
-public class IssueSatisfactionDetailServiceImpl extends BaseServiceImpl<IssueSatisfactionDetailDao, IssueSatisfactionDetailEntity> implements IssueSatisfactionDetailService {
-
-    @Autowired
-    private IssueSatisfactionDetailRedis issueSatisfactionDetailRedis;
-
-    @Override
-    public PageData<IssueSatisfactionDetailDTO> page(Map<String, Object> params) {
-        IPage<IssueSatisfactionDetailEntity> page = baseDao.selectPage(
-                getPage(params, FieldConstant.CREATED_TIME, false),
-                getWrapper(params)
-        );
-        return getPageData(page, IssueSatisfactionDetailDTO.class);
-    }
-
-    @Override
-    public List<IssueSatisfactionDetailDTO> list(Map<String, Object> params) {
-        List<IssueSatisfactionDetailEntity> entityList = baseDao.selectList(getWrapper(params));
-
-        return ConvertUtils.sourceToTarget(entityList, IssueSatisfactionDetailDTO.class);
-    }
-
-    private QueryWrapper<IssueSatisfactionDetailEntity> getWrapper(Map<String, Object> params){
-        String id = (String)params.get(FieldConstant.ID_HUMP);
-
-        QueryWrapper<IssueSatisfactionDetailEntity> wrapper = new QueryWrapper<>();
-        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
-
-        return wrapper;
-    }
-
-    @Override
-    public IssueSatisfactionDetailDTO get(String id) {
-        IssueSatisfactionDetailEntity entity = baseDao.selectById(id);
-        return ConvertUtils.sourceToTarget(entity, IssueSatisfactionDetailDTO.class);
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public void save(IssueSatisfactionDetailDTO dto) {
-        IssueSatisfactionDetailEntity entity = ConvertUtils.sourceToTarget(dto, IssueSatisfactionDetailEntity.class);
-        insert(entity);
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public void update(IssueSatisfactionDetailDTO dto) {
-        IssueSatisfactionDetailEntity entity = ConvertUtils.sourceToTarget(dto, IssueSatisfactionDetailEntity.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/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueSatisfactionStatisticalServiceImpl.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueSatisfactionStatisticalServiceImpl.java
deleted file mode 100644
index f912e4d4c9..0000000000
--- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueSatisfactionStatisticalServiceImpl.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/**
- * 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.IssueSatisfactionStatisticalDao;
-import com.epmet.dto.IssueSatisfactionStatisticalDTO;
-import com.epmet.entity.IssueSatisfactionStatisticalEntity;
-import com.epmet.redis.IssueSatisfactionStatisticalRedis;
-import com.epmet.service.IssueSatisfactionStatisticalService;
-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 2020-05-11
- */
-@Service
-public class IssueSatisfactionStatisticalServiceImpl extends BaseServiceImpl<IssueSatisfactionStatisticalDao, IssueSatisfactionStatisticalEntity> implements IssueSatisfactionStatisticalService {
-
-    @Autowired
-    private IssueSatisfactionStatisticalRedis issueSatisfactionStatisticalRedis;
-
-    @Override
-    public PageData<IssueSatisfactionStatisticalDTO> page(Map<String, Object> params) {
-        IPage<IssueSatisfactionStatisticalEntity> page = baseDao.selectPage(
-                getPage(params, FieldConstant.CREATED_TIME, false),
-                getWrapper(params)
-        );
-        return getPageData(page, IssueSatisfactionStatisticalDTO.class);
-    }
-
-    @Override
-    public List<IssueSatisfactionStatisticalDTO> list(Map<String, Object> params) {
-        List<IssueSatisfactionStatisticalEntity> entityList = baseDao.selectList(getWrapper(params));
-
-        return ConvertUtils.sourceToTarget(entityList, IssueSatisfactionStatisticalDTO.class);
-    }
-
-    private QueryWrapper<IssueSatisfactionStatisticalEntity> getWrapper(Map<String, Object> params){
-        String id = (String)params.get(FieldConstant.ID_HUMP);
-
-        QueryWrapper<IssueSatisfactionStatisticalEntity> wrapper = new QueryWrapper<>();
-        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
-
-        return wrapper;
-    }
-
-    @Override
-    public IssueSatisfactionStatisticalDTO get(String id) {
-        IssueSatisfactionStatisticalEntity entity = baseDao.selectById(id);
-        return ConvertUtils.sourceToTarget(entity, IssueSatisfactionStatisticalDTO.class);
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public void save(IssueSatisfactionStatisticalDTO dto) {
-        IssueSatisfactionStatisticalEntity entity = ConvertUtils.sourceToTarget(dto, IssueSatisfactionStatisticalEntity.class);
-        insert(entity);
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public void update(IssueSatisfactionStatisticalDTO dto) {
-        IssueSatisfactionStatisticalEntity entity = ConvertUtils.sourceToTarget(dto, IssueSatisfactionStatisticalEntity.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/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueVoteDetailServiceImpl.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueVoteDetailServiceImpl.java
deleted file mode 100644
index e63133484c..0000000000
--- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueVoteDetailServiceImpl.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/**
- * 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.IssueVoteDetailDao;
-import com.epmet.dto.IssueVoteDetailDTO;
-import com.epmet.entity.IssueVoteDetailEntity;
-import com.epmet.redis.IssueVoteDetailRedis;
-import com.epmet.service.IssueVoteDetailService;
-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 2020-05-11
- */
-@Service
-public class IssueVoteDetailServiceImpl extends BaseServiceImpl<IssueVoteDetailDao, IssueVoteDetailEntity> implements IssueVoteDetailService {
-
-    @Autowired
-    private IssueVoteDetailRedis issueVoteDetailRedis;
-
-    @Override
-    public PageData<IssueVoteDetailDTO> page(Map<String, Object> params) {
-        IPage<IssueVoteDetailEntity> page = baseDao.selectPage(
-                getPage(params, FieldConstant.CREATED_TIME, false),
-                getWrapper(params)
-        );
-        return getPageData(page, IssueVoteDetailDTO.class);
-    }
-
-    @Override
-    public List<IssueVoteDetailDTO> list(Map<String, Object> params) {
-        List<IssueVoteDetailEntity> entityList = baseDao.selectList(getWrapper(params));
-
-        return ConvertUtils.sourceToTarget(entityList, IssueVoteDetailDTO.class);
-    }
-
-    private QueryWrapper<IssueVoteDetailEntity> getWrapper(Map<String, Object> params){
-        String id = (String)params.get(FieldConstant.ID_HUMP);
-
-        QueryWrapper<IssueVoteDetailEntity> wrapper = new QueryWrapper<>();
-        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
-
-        return wrapper;
-    }
-
-    @Override
-    public IssueVoteDetailDTO get(String id) {
-        IssueVoteDetailEntity entity = baseDao.selectById(id);
-        return ConvertUtils.sourceToTarget(entity, IssueVoteDetailDTO.class);
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public void save(IssueVoteDetailDTO dto) {
-        IssueVoteDetailEntity entity = ConvertUtils.sourceToTarget(dto, IssueVoteDetailEntity.class);
-        insert(entity);
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public void update(IssueVoteDetailDTO dto) {
-        IssueVoteDetailEntity entity = ConvertUtils.sourceToTarget(dto, IssueVoteDetailEntity.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/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueVoteStatisticalDailyServiceImpl.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueVoteStatisticalDailyServiceImpl.java
deleted file mode 100644
index e356e2fa0a..0000000000
--- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueVoteStatisticalDailyServiceImpl.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/**
- * 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.IssueVoteStatisticalDailyDao;
-import com.epmet.dto.IssueVoteStatisticalDailyDTO;
-import com.epmet.entity.IssueVoteStatisticalDailyEntity;
-import com.epmet.redis.IssueVoteStatisticalDailyRedis;
-import com.epmet.service.IssueVoteStatisticalDailyService;
-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 2020-05-11
- */
-@Service
-public class IssueVoteStatisticalDailyServiceImpl extends BaseServiceImpl<IssueVoteStatisticalDailyDao, IssueVoteStatisticalDailyEntity> implements IssueVoteStatisticalDailyService {
-
-    @Autowired
-    private IssueVoteStatisticalDailyRedis issueVoteStatisticalDailyRedis;
-
-    @Override
-    public PageData<IssueVoteStatisticalDailyDTO> page(Map<String, Object> params) {
-        IPage<IssueVoteStatisticalDailyEntity> page = baseDao.selectPage(
-                getPage(params, FieldConstant.CREATED_TIME, false),
-                getWrapper(params)
-        );
-        return getPageData(page, IssueVoteStatisticalDailyDTO.class);
-    }
-
-    @Override
-    public List<IssueVoteStatisticalDailyDTO> list(Map<String, Object> params) {
-        List<IssueVoteStatisticalDailyEntity> entityList = baseDao.selectList(getWrapper(params));
-
-        return ConvertUtils.sourceToTarget(entityList, IssueVoteStatisticalDailyDTO.class);
-    }
-
-    private QueryWrapper<IssueVoteStatisticalDailyEntity> getWrapper(Map<String, Object> params){
-        String id = (String)params.get(FieldConstant.ID_HUMP);
-
-        QueryWrapper<IssueVoteStatisticalDailyEntity> wrapper = new QueryWrapper<>();
-        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
-
-        return wrapper;
-    }
-
-    @Override
-    public IssueVoteStatisticalDailyDTO get(String id) {
-        IssueVoteStatisticalDailyEntity entity = baseDao.selectById(id);
-        return ConvertUtils.sourceToTarget(entity, IssueVoteStatisticalDailyDTO.class);
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public void save(IssueVoteStatisticalDailyDTO dto) {
-        IssueVoteStatisticalDailyEntity entity = ConvertUtils.sourceToTarget(dto, IssueVoteStatisticalDailyEntity.class);
-        insert(entity);
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public void update(IssueVoteStatisticalDailyDTO dto) {
-        IssueVoteStatisticalDailyEntity entity = ConvertUtils.sourceToTarget(dto, IssueVoteStatisticalDailyEntity.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/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueVoteStatisticalServiceImpl.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueVoteStatisticalServiceImpl.java
deleted file mode 100644
index bff7fd4f94..0000000000
--- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/service/impl/IssueVoteStatisticalServiceImpl.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/**
- * 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.IssueVoteStatisticalDao;
-import com.epmet.dto.IssueVoteStatisticalDTO;
-import com.epmet.entity.IssueVoteStatisticalEntity;
-import com.epmet.redis.IssueVoteStatisticalRedis;
-import com.epmet.service.IssueVoteStatisticalService;
-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 2020-05-11
- */
-@Service
-public class IssueVoteStatisticalServiceImpl extends BaseServiceImpl<IssueVoteStatisticalDao, IssueVoteStatisticalEntity> implements IssueVoteStatisticalService {
-
-    @Autowired
-    private IssueVoteStatisticalRedis issueVoteStatisticalRedis;
-
-    @Override
-    public PageData<IssueVoteStatisticalDTO> page(Map<String, Object> params) {
-        IPage<IssueVoteStatisticalEntity> page = baseDao.selectPage(
-                getPage(params, FieldConstant.CREATED_TIME, false),
-                getWrapper(params)
-        );
-        return getPageData(page, IssueVoteStatisticalDTO.class);
-    }
-
-    @Override
-    public List<IssueVoteStatisticalDTO> list(Map<String, Object> params) {
-        List<IssueVoteStatisticalEntity> entityList = baseDao.selectList(getWrapper(params));
-
-        return ConvertUtils.sourceToTarget(entityList, IssueVoteStatisticalDTO.class);
-    }
-
-    private QueryWrapper<IssueVoteStatisticalEntity> getWrapper(Map<String, Object> params){
-        String id = (String)params.get(FieldConstant.ID_HUMP);
-
-        QueryWrapper<IssueVoteStatisticalEntity> wrapper = new QueryWrapper<>();
-        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
-
-        return wrapper;
-    }
-
-    @Override
-    public IssueVoteStatisticalDTO get(String id) {
-        IssueVoteStatisticalEntity entity = baseDao.selectById(id);
-        return ConvertUtils.sourceToTarget(entity, IssueVoteStatisticalDTO.class);
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public void save(IssueVoteStatisticalDTO dto) {
-        IssueVoteStatisticalEntity entity = ConvertUtils.sourceToTarget(dto, IssueVoteStatisticalEntity.class);
-        insert(entity);
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public void update(IssueVoteStatisticalDTO dto) {
-        IssueVoteStatisticalEntity entity = ConvertUtils.sourceToTarget(dto, IssueVoteStatisticalEntity.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/resi-hall/resi-hall-server/src/main/resources/mapper/IssueCustomerParameterDao.xml b/epmet-module/resi-hall/resi-hall-server/src/main/resources/mapper/IssueCustomerParameterDao.xml
deleted file mode 100644
index d0934a775e..0000000000
--- a/epmet-module/resi-hall/resi-hall-server/src/main/resources/mapper/IssueCustomerParameterDao.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?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.IssueCustomerParameterDao">
-
-    <resultMap type="com.epmet.entity.IssueCustomerParameterEntity" id="issueCustomerParameterMap">
-        <result property="id" column="ID"/>
-        <result property="customerId" column="CUSTOMER_ID"/>
-        <result property="parameterKey" column="PARAMETER_KEY"/>
-        <result property="parameterName" column="PARAMETER_NAME"/>
-        <result property="parameterValue" column="PARAMETER_VALUE"/>
-        <result property="description" column="DESCRIPTION"/>
-        <result property="delFlag" column="DEL_FLAG"/>
-        <result property="revision" column="REVISION"/>
-        <result property="createdBy" column="CREATED_BY"/>
-        <result property="createdTime" column="CREATED_TIME"/>
-        <result property="updatedBy" column="UPDATED_BY"/>
-        <result property="updatedTime" column="UPDATED_TIME"/>
-    </resultMap>
-
-
-</mapper>
\ No newline at end of file
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/resources/mapper/IssueProcessDao.xml b/epmet-module/resi-hall/resi-hall-server/src/main/resources/mapper/IssueProcessDao.xml
deleted file mode 100644
index 81b04ec584..0000000000
--- a/epmet-module/resi-hall/resi-hall-server/src/main/resources/mapper/IssueProcessDao.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?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.IssueProcessDao">
-
-    <resultMap type="com.epmet.entity.IssueProcessEntity" id="issueProcessMap">
-        <result property="id" column="ID"/>
-        <result property="issueId" column="ISSUE_ID"/>
-        <result property="issueStatus" column="ISSUE_STATUS"/>
-        <result property="orgType" column="ORG_TYPE"/>
-        <result property="orgId" column="ORG_ID"/>
-        <result property="operationExplain" column="OPERATION_EXPLAIN"/>
-        <result property="delFlag" column="DEL_FLAG"/>
-        <result property="revision" column="REVISION"/>
-        <result property="createdBy" column="CREATED_BY"/>
-        <result property="createdTime" column="CREATED_TIME"/>
-        <result property="updatedBy" column="UPDATED_BY"/>
-        <result property="updatedTime" column="UPDATED_TIME"/>
-    </resultMap>
-
-
-</mapper>
\ No newline at end of file
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/resources/mapper/IssueProjectRelationDao.xml b/epmet-module/resi-hall/resi-hall-server/src/main/resources/mapper/IssueProjectRelationDao.xml
deleted file mode 100644
index d7188c1811..0000000000
--- a/epmet-module/resi-hall/resi-hall-server/src/main/resources/mapper/IssueProjectRelationDao.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?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.IssueProjectRelationDao">
-
-    <resultMap type="com.epmet.entity.IssueProjectRelationEntity" id="issueProjectRelationMap">
-        <result property="id" column="ID"/>
-        <result property="issueId" column="ISSUE_ID"/>
-        <result property="projectId" column="PROJECT_ID"/>
-        <result property="delFlag" column="DEL_FLAG"/>
-        <result property="revision" column="REVISION"/>
-        <result property="createdBy" column="CREATED_BY"/>
-        <result property="createdTime" column="CREATED_TIME"/>
-        <result property="updatedBy" column="UPDATED_BY"/>
-        <result property="updatedTime" column="UPDATED_TIME"/>
-    </resultMap>
-
-
-</mapper>
\ No newline at end of file
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/resources/mapper/IssueSatisfactionDetailDao.xml b/epmet-module/resi-hall/resi-hall-server/src/main/resources/mapper/IssueSatisfactionDetailDao.xml
deleted file mode 100644
index 86f0a14d13..0000000000
--- a/epmet-module/resi-hall/resi-hall-server/src/main/resources/mapper/IssueSatisfactionDetailDao.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?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.IssueSatisfactionDetailDao">
-
-    <resultMap type="com.epmet.entity.IssueSatisfactionDetailEntity" id="issueSatisfactionDetailMap">
-        <result property="id" column="ID"/>
-        <result property="issueId" column="ISSUE_ID"/>
-        <result property="comment" column="COMMENT"/>
-        <result property="satisfaction" column="SATISFACTION"/>
-        <result property="delFlag" column="DEL_FLAG"/>
-        <result property="revision" column="REVISION"/>
-        <result property="createdBy" column="CREATED_BY"/>
-        <result property="createdTime" column="CREATED_TIME"/>
-        <result property="updatedBy" column="UPDATED_BY"/>
-        <result property="updatedTime" column="UPDATED_TIME"/>
-    </resultMap>
-
-
-</mapper>
\ No newline at end of file
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/resources/mapper/IssueSatisfactionStatisticalDao.xml b/epmet-module/resi-hall/resi-hall-server/src/main/resources/mapper/IssueSatisfactionStatisticalDao.xml
deleted file mode 100644
index ccc9f115c6..0000000000
--- a/epmet-module/resi-hall/resi-hall-server/src/main/resources/mapper/IssueSatisfactionStatisticalDao.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?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.IssueSatisfactionStatisticalDao">
-
-    <resultMap type="com.epmet.entity.IssueSatisfactionStatisticalEntity" id="issueSatisfactionStatisticalMap">
-        <result property="id" column="ID"/>
-        <result property="issueId" column="ISSUE_ID"/>
-        <result property="goodCount" column="GOOD_COUNT"/>
-        <result property="perfectCount" column="PERFECT_COUNT"/>
-        <result property="badCount" column="BAD_COUNT"/>
-        <result property="delFlag" column="DEL_FLAG"/>
-        <result property="revision" column="REVISION"/>
-        <result property="createdBy" column="CREATED_BY"/>
-        <result property="createdTime" column="CREATED_TIME"/>
-        <result property="updatedBy" column="UPDATED_BY"/>
-        <result property="updatedTime" column="UPDATED_TIME"/>
-    </resultMap>
-
-
-</mapper>
\ No newline at end of file
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/resources/mapper/IssueVoteDetailDao.xml b/epmet-module/resi-hall/resi-hall-server/src/main/resources/mapper/IssueVoteDetailDao.xml
deleted file mode 100644
index 93a382ef60..0000000000
--- a/epmet-module/resi-hall/resi-hall-server/src/main/resources/mapper/IssueVoteDetailDao.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?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.IssueVoteDetailDao">
-
-    <resultMap type="com.epmet.entity.IssueVoteDetailEntity" id="issueVoteDetailMap">
-        <result property="id" column="ID"/>
-        <result property="issueId" column="ISSUE_ID"/>
-        <result property="attitude" column="ATTITUDE"/>
-        <result property="delFlag" column="DEL_FLAG"/>
-        <result property="revision" column="REVISION"/>
-        <result property="createdBy" column="CREATED_BY"/>
-        <result property="createdTime" column="CREATED_TIME"/>
-        <result property="updatedBy" column="UPDATED_BY"/>
-        <result property="updatedTime" column="UPDATED_TIME"/>
-    </resultMap>
-
-
-</mapper>
\ No newline at end of file
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/resources/mapper/IssueVoteStatisticalDailyDao.xml b/epmet-module/resi-hall/resi-hall-server/src/main/resources/mapper/IssueVoteStatisticalDailyDao.xml
deleted file mode 100644
index fc9b69d379..0000000000
--- a/epmet-module/resi-hall/resi-hall-server/src/main/resources/mapper/IssueVoteStatisticalDailyDao.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?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.IssueVoteStatisticalDailyDao">
-
-    <resultMap type="com.epmet.entity.IssueVoteStatisticalDailyEntity" id="issueVoteStatisticalDailyMap">
-        <result property="id" column="ID"/>
-        <result property="issueId" column="ISSUE_ID"/>
-        <result property="statisticalDate" column="STATISTICAL_DATE"/>
-        <result property="supportCount" column="SUPPORT_COUNT"/>
-        <result property="oppositionCount" column="OPPOSITION_COUNT"/>
-        <result property="totalCount" column="TOTAL_COUNT"/>
-        <result property="todayIncrement" column="TODAY_INCREMENT"/>
-        <result property="supportIncrement" column="SUPPORT_INCREMENT"/>
-        <result property="oppositionIncrement" column="OPPOSITION_INCREMENT"/>
-        <result property="votableCount" column="VOTABLE_COUNT"/>
-        <result property="delFlag" column="DEL_FLAG"/>
-        <result property="revision" column="REVISION"/>
-        <result property="createdBy" column="CREATED_BY"/>
-        <result property="createdTime" column="CREATED_TIME"/>
-        <result property="updatedBy" column="UPDATED_BY"/>
-        <result property="updatedTime" column="UPDATED_TIME"/>
-    </resultMap>
-
-
-</mapper>
\ No newline at end of file
diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/resources/mapper/IssueVoteStatisticalDao.xml b/epmet-module/resi-hall/resi-hall-server/src/main/resources/mapper/IssueVoteStatisticalDao.xml
deleted file mode 100644
index d34f9eb2ae..0000000000
--- a/epmet-module/resi-hall/resi-hall-server/src/main/resources/mapper/IssueVoteStatisticalDao.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?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.IssueVoteStatisticalDao">
-
-    <resultMap type="com.epmet.entity.IssueVoteStatisticalEntity" id="issueVoteStatisticalMap">
-        <result property="id" column="ID"/>
-        <result property="issueId" column="ISSUE_ID"/>
-        <result property="supportCount" column="SUPPORT_COUNT"/>
-        <result property="oppositionCount" column="OPPOSITION_COUNT"/>
-        <result property="votableCount" column="VOTABLE_COUNT"/>
-        <result property="revision" column="REVISION"/>
-        <result property="delFlag" column="DEL_FLAG"/>
-        <result property="createdBy" column="CREATED_BY"/>
-        <result property="createdTime" column="CREATED_TIME"/>
-        <result property="updatedBy" column="UPDATED_BY"/>
-        <result property="updatedTime" column="UPDATED_TIME"/>
-    </resultMap>
-
-
-</mapper>
\ No newline at end of file
diff --git a/epmet-module/resi-hall/resi-hall.iml b/epmet-module/resi-hall/resi-hall.iml
new file mode 100644
index 0000000000..0d9345ff78
--- /dev/null
+++ b/epmet-module/resi-hall/resi-hall.iml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
+    <output url="file://$MODULE_DIR$/target/classes" />
+    <output-test url="file://$MODULE_DIR$/target/test-classes" />
+    <content url="file://$MODULE_DIR$">
+      <excludeFolder url="file://$MODULE_DIR$/target" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-starter-test:2.1.11.RELEASE" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-starter:2.1.11.RELEASE" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot:2.1.11.RELEASE" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.springframework:spring-context:5.1.12.RELEASE" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.springframework:spring-aop:5.1.12.RELEASE" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.springframework:spring-beans:5.1.12.RELEASE" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.springframework:spring-expression:5.1.12.RELEASE" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.1.11.RELEASE" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.1.11.RELEASE" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: ch.qos.logback:logback-classic:1.2.3" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: ch.qos.logback:logback-core:1.2.3" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.apache.logging.log4j:log4j-to-slf4j:2.11.2" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.apache.logging.log4j:log4j-api:2.11.2" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.slf4j:jul-to-slf4j:1.7.29" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: javax.annotation:javax.annotation-api:1.3.2" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.yaml:snakeyaml:1.23" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test:2.1.11.RELEASE" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test-autoconfigure:2.1.11.RELEASE" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: com.jayway.jsonpath:json-path:2.4.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: net.minidev:json-smart:2.3" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: net.minidev:accessors-smart:1.2" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.ow2.asm:asm:5.0.4" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.slf4j:slf4j-api:1.7.29" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.assertj:assertj-core:3.11.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-core:2.23.4" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: net.bytebuddy:byte-buddy:1.9.16" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: net.bytebuddy:byte-buddy-agent:1.9.16" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.objenesis:objenesis:2.6" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-library:1.3" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.skyscreamer:jsonassert:1.5.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: com.vaadin.external.google:android-json:0.0.20131108.vaadin1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.springframework:spring-core:5.1.12.RELEASE" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.springframework:spring-jcl:5.1.12.RELEASE" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.springframework:spring-test:5.1.12.RELEASE" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.xmlunit:xmlunit-core:2.6.3" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: javax.xml.bind:jaxb-api:2.3.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: javax.activation:javax.activation-api:1.2.0" level="project" />
+  </component>
+</module>
\ No newline at end of file