重名了呀

epmet-user/epmet-user-client/src/main/java/com/epmet/constant/IcResiUserConstant.java

@@ -15,4 +15,13 @@ public interface IcResiUserConstant {
 	String USER_TYPE_IC_RESI="icresi";
 	String USER_TYPE_INPUT="input";
 	String USER_TYPE_IMPORT="import";
+
+
+	// origin:变动：change; 迁出：out;    死亡：died; 出生birth; 迁入：in
+	String CHANGE = "change";
+	String OUT = "out";
+	String DIED = "died";
+	String BIRTH = "birth";
+	String IN = "in";
+
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/constant/IcResiUserConstant.java

@@ -1,14 +0,0 @@
-package com.epmet.constant;
-
-public interface IcResiUserConstant {
-    // origin:变动：change; 迁出：out;    死亡：died; 出生birth; 迁入：in
-    String CHANGE = "change";
-    String OUT = "out";
-    String DIED = "died";
-    String BIRTH = "birth";
-    String IN = "in";
-
-
-
-
-}

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

@@ -19,7 +19,6 @@ import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.*;
 import com.epmet.commons.tools.utils.poi.excel.handler.FreezeAndFilter;
 import com.epmet.commons.tools.validator.ValidatorUtils;
-import com.epmet.constant.IcResiUserConstant;
 import com.epmet.constants.ImportTaskConstants;
 import com.epmet.dto.IcTripReportRecordDTO;
 import com.epmet.dto.form.IcTripReportFormDTO;

epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcTripReportExcelImportListener.java

@@ -7,7 +7,6 @@ import com.epmet.commons.tools.exception.ExceptionUtils;
 import com.epmet.commons.tools.exception.ValidateException;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.validator.ValidatorUtils;
-import com.epmet.constant.IcResiUserConstant;
 import com.epmet.entity.IcTripReportRecordEntity;
 import com.epmet.excel.data.IcTripReportExcelData;
 import com.epmet.service.impl.IcTripReportRecordServiceImpl;

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

@@ -27,7 +27,6 @@ import com.epmet.commons.tools.utils.SpringContextUtils;
 import com.epmet.commons.tools.utils.poi.excel.handler.FreezeAndFilter;
 import com.epmet.commons.tools.utils.poi.excel.handler.ExcelFillCellMergeStrategy;
 import com.epmet.commons.tools.validator.ValidatorUtils;
-import com.epmet.constant.IcResiUserConstant;
 import com.epmet.dto.form.ExportResiUserFormDTO;
 import com.epmet.dto.form.IcExportTemplateQueryFormDTO;
 import com.epmet.dto.form.IcResiUserPageFormDTO;

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

@@ -21,7 +21,6 @@ import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.DateUtils;
 import com.epmet.commons.tools.utils.FileUtils;
 import com.epmet.commons.tools.utils.Result;
-import com.epmet.constant.IcResiUserConstant;
 import com.epmet.constants.ImportTaskConstants;
 import com.epmet.dao.IcTripReportRecordDao;
 import com.epmet.dao.UserBaseInfoDao;