Merge remote-tracking branch 'origin/master'

zhywpt-app-iaw/src/main/java/cn/com/taiji/iaw/api/ass/etcTransaction/EtcTransactionController.java

@@ -3,10 +3,10 @@ package cn.com.taiji.iaw.api.ass.etcTransaction;
 import cn.com.taiji.common.manager.ManagerException;
 import cn.com.taiji.common.web.ApiResponse;
 import cn.com.taiji.iaw.api.MyValidController;
-import cn.com.taiji.iaw.dto.ass.etcTransactionRefund.ExportProvinceEtcTransactionFlowRequestDTO;
-import cn.com.taiji.iaw.dto.ass.etcTransactionRefund.ExportProvinceEtcTransactionFlowResponseDTO;
-import cn.com.taiji.iaw.dto.ass.etcTransactionRefund.QueryProvinceEtcTransactionFlowRequestDTO;
-import cn.com.taiji.iaw.dto.ass.etcTransactionRefund.QueryProvinceEtcTransactionFlowResponseDTO;
+import cn.com.taiji.iaw.dto.ass.etcTransaction.ExportProvinceEtcTransactionFlowRequestDTO;
+import cn.com.taiji.iaw.dto.ass.etcTransaction.ExportProvinceEtcTransactionFlowResponseDTO;
+import cn.com.taiji.iaw.dto.ass.etcTransaction.QueryProvinceEtcTransactionFlowRequestDTO;
+import cn.com.taiji.iaw.dto.ass.etcTransaction.QueryProvinceEtcTransactionFlowResponseDTO;
 import cn.com.taiji.iaw.manager.ass.etcTransaction.EtcTransactionManager;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

zhywpt-app-iaw/src/main/java/cn/com/taiji/iaw/dto/ass/etcTransactionRefund/ExportProvinceEtcTransactionFlowRequestDTO.java → zhywpt-app-iaw/src/main/java/cn/com/taiji/iaw/dto/ass/etcTransaction/ExportProvinceEtcTransactionFlowRequestDTO.java

@@ -1,4 +1,4 @@
-package cn.com.taiji.iaw.dto.ass.etcTransactionRefund;
+package cn.com.taiji.iaw.dto.ass.etcTransaction;
 
 import cn.com.taiji.core.dto.AbstractBizRequestDTO;
 import com.fasterxml.jackson.annotation.JsonFormat;

zhywpt-app-iaw/src/main/java/cn/com/taiji/iaw/dto/ass/etcTransactionRefund/ExportProvinceEtcTransactionFlowResponseDTO.java → zhywpt-app-iaw/src/main/java/cn/com/taiji/iaw/dto/ass/etcTransaction/ExportProvinceEtcTransactionFlowResponseDTO.java

@@ -1,14 +1,10 @@
-package cn.com.taiji.iaw.dto.ass.etcTransactionRefund;
+package cn.com.taiji.iaw.dto.ass.etcTransaction;
 
 import cn.com.taiji.common.model.BaseModel;
-import cn.com.taiji.core.model.comm.protocol.ias.province.model.GetOriginListResModel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
-import org.springframework.beans.factory.annotation.Autowired;
-
-import java.util.List;
 
 
 /**

zhywpt-app-iaw/src/main/java/cn/com/taiji/iaw/dto/ass/etcTransactionRefund/QueryProvinceEtcTransactionFlowRequestDTO.java → zhywpt-app-iaw/src/main/java/cn/com/taiji/iaw/dto/ass/etcTransaction/QueryProvinceEtcTransactionFlowRequestDTO.java

@@ -1,4 +1,4 @@
-package cn.com.taiji.iaw.dto.ass.etcTransactionRefund;
+package cn.com.taiji.iaw.dto.ass.etcTransaction;
 
 import cn.com.taiji.core.dto.AbstractBizRequestDTO;
 import com.fasterxml.jackson.annotation.JsonFormat;

zhywpt-app-iaw/src/main/java/cn/com/taiji/iaw/dto/ass/etcTransactionRefund/QueryProvinceEtcTransactionFlowResponseDTO.java → zhywpt-app-iaw/src/main/java/cn/com/taiji/iaw/dto/ass/etcTransaction/QueryProvinceEtcTransactionFlowResponseDTO.java

@@ -1,4 +1,4 @@
-package cn.com.taiji.iaw.dto.ass.etcTransactionRefund;
+package cn.com.taiji.iaw.dto.ass.etcTransaction;
 
 import cn.com.taiji.common.model.BaseModel;
 import cn.com.taiji.core.model.comm.protocol.ias.province.model.GetOriginListResModel;

zhywpt-app-iaw/src/main/java/cn/com/taiji/iaw/manager/ass/etcTransaction/EtcTransactionManager.java

@@ -1,10 +1,10 @@
 package cn.com.taiji.iaw.manager.ass.etcTransaction;
 
 import cn.com.taiji.common.manager.ManagerException;
-import cn.com.taiji.iaw.dto.ass.etcTransactionRefund.ExportProvinceEtcTransactionFlowRequestDTO;
-import cn.com.taiji.iaw.dto.ass.etcTransactionRefund.ExportProvinceEtcTransactionFlowResponseDTO;
-import cn.com.taiji.iaw.dto.ass.etcTransactionRefund.QueryProvinceEtcTransactionFlowRequestDTO;
-import cn.com.taiji.iaw.dto.ass.etcTransactionRefund.QueryProvinceEtcTransactionFlowResponseDTO;
+import cn.com.taiji.iaw.dto.ass.etcTransaction.ExportProvinceEtcTransactionFlowRequestDTO;
+import cn.com.taiji.iaw.dto.ass.etcTransaction.ExportProvinceEtcTransactionFlowResponseDTO;
+import cn.com.taiji.iaw.dto.ass.etcTransaction.QueryProvinceEtcTransactionFlowRequestDTO;
+import cn.com.taiji.iaw.dto.ass.etcTransaction.QueryProvinceEtcTransactionFlowResponseDTO;
 
 /**
  * @Auther: humh

zhywpt-app-iaw/src/main/java/cn/com/taiji/iaw/manager/ass/etcTransaction/EtcTransactionManagerImpl.java

@@ -7,10 +7,10 @@ import cn.com.taiji.core.manager.tools.minio.MinioUtil;
 import cn.com.taiji.core.model.comm.protocol.ias.province.GetOriginListRequest;
 import cn.com.taiji.core.model.comm.protocol.ias.province.GetOriginListResponse;
 import cn.com.taiji.core.model.comm.protocol.ias.province.model.GetOriginListResModel;
-import cn.com.taiji.iaw.dto.ass.etcTransactionRefund.ExportProvinceEtcTransactionFlowRequestDTO;
-import cn.com.taiji.iaw.dto.ass.etcTransactionRefund.ExportProvinceEtcTransactionFlowResponseDTO;
-import cn.com.taiji.iaw.dto.ass.etcTransactionRefund.QueryProvinceEtcTransactionFlowRequestDTO;
-import cn.com.taiji.iaw.dto.ass.etcTransactionRefund.QueryProvinceEtcTransactionFlowResponseDTO;
+import cn.com.taiji.iaw.dto.ass.etcTransaction.ExportProvinceEtcTransactionFlowRequestDTO;
+import cn.com.taiji.iaw.dto.ass.etcTransaction.ExportProvinceEtcTransactionFlowResponseDTO;
+import cn.com.taiji.iaw.dto.ass.etcTransaction.QueryProvinceEtcTransactionFlowRequestDTO;
+import cn.com.taiji.iaw.dto.ass.etcTransaction.QueryProvinceEtcTransactionFlowResponseDTO;
 import cn.com.taiji.iaw.manager.AbstractIawManager;
 import cn.com.taiji.iaw.model.etcTransaction.ProvinceEtcTransactionFlowExcelModel;
 import cn.com.taiji.iaw.tools.SourceTargetMapper;