From caa1fa5408c6e788c5321ced1dee8ca737d78e49 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Tue, 29 Mar 2022 09:23:43 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=A1=A8=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/dto/IcTripReportRecordDTO.java   | 13 ++-----------
 .../com/epmet/entity/IcTripReportRecordEntity.java  | 10 ----------
 .../com/epmet/excel/IcTripReportRecordExcel.java    |  6 ------
 3 files changed, 2 insertions(+), 27 deletions(-)

diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcTripReportRecordDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcTripReportRecordDTO.java
index 7c452c6e8f..dd9c513896 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcTripReportRecordDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcTripReportRecordDTO.java
@@ -1,8 +1,9 @@
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -51,16 +52,6 @@ public class IcTripReportRecordDTO implements Serializable {
      */
 	private String userType;
 
-    /**
-     * 0：未加入；1:已加入
-     */
-	private Integer heSuanCheck;
-
-    /**
-     * 最近一次通知时间
-     */
-	private Date latestNoticeTime;
-
     /**
      * 现居地编码
      */
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcTripReportRecordEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcTripReportRecordEntity.java
index 6ca87717fa..ee0e00b81f 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcTripReportRecordEntity.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcTripReportRecordEntity.java
@@ -51,16 +51,6 @@ public class IcTripReportRecordEntity extends BaseEpmetEntity {
      */
 	private String userType;
 
-    /**
-     * 0：未加入；1:已加入
-     */
-	private Integer heSuanCheck;
-
-    /**
-     * 最近一次通知时间
-     */
-	private Date latestNoticeTime;
-
     /**
      * 现居地编码
      */
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcTripReportRecordExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcTripReportRecordExcel.java
index c904a6c244..446ba0075a 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcTripReportRecordExcel.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcTripReportRecordExcel.java
@@ -35,12 +35,6 @@ public class IcTripReportRecordExcel {
     @Excel(name = "居民端小程序的人：resi;数字社区的居民：icresi;未关联上的：other")
     private String userType;
 
-    @Excel(name = "0：未加入；1:已加入")
-    private Integer heSuanCheck;
-
-    @Excel(name = "最近一次通知时间")
-    private Date latestNoticeTime;
-
     @Excel(name = "现居地编码")
     private String presentAddressCode;
 

From d23c07ef764c2a940ec1af8b5ffe08f6d12bf919 Mon Sep 17 00:00:00 2001
From: wangxianzhang <ZHANGYUGE6666>
Date: Tue, 29 Mar 2022 09:24:37 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E6=A0=B8=E9=85=B8?=
 =?UTF-8?q?=E6=A3=80=E6=B5=8Bexcel=20url=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/epmet/controller/IcNatController.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcNatController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcNatController.java
index fd3d23f2f6..30e3461ae0 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcNatController.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcNatController.java
@@ -163,7 +163,7 @@ public class IcNatController implements ResultDataResolver {
      * 导入excel
      * @return
      */
-    @PostMapping("importExcel")
+    @PostMapping("import")
     public Result importExcel(MultipartFile file) {
         String userId = EpmetRequestHolder.getHeader(AppClientConstant.USER_ID);