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/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); 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;