diff --git a/zt-module-base/zt-module-base-api/pom.xml b/zt-module-base/zt-module-base-api/pom.xml
index 1b7c523f..5feef20f 100644
--- a/zt-module-base/zt-module-base-api/pom.xml
+++ b/zt-module-base/zt-module-base-api/pom.xml
@@ -35,6 +35,11 @@
true
+
+ com.alibaba
+ easyexcel
+
+
org.springframework.cloud
diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/templtp/vo/TmplInscDatBsnRespVO.java b/zt-module-base/zt-module-base-api/src/main/java/com/zt/plat/module/base/controller/admin/templtp/vo/TmplInscDatBsnRespVO.java
similarity index 91%
rename from zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/templtp/vo/TmplInscDatBsnRespVO.java
rename to zt-module-base/zt-module-base-api/src/main/java/com/zt/plat/module/base/controller/admin/templtp/vo/TmplInscDatBsnRespVO.java
index de94d76c..b4566a3c 100644
--- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/templtp/vo/TmplInscDatBsnRespVO.java
+++ b/zt-module-base/zt-module-base-api/src/main/java/com/zt/plat/module/base/controller/admin/templtp/vo/TmplInscDatBsnRespVO.java
@@ -1,11 +1,12 @@
package com.zt.plat.module.base.controller.admin.templtp.vo;
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
import java.time.LocalDate;
import java.util.*;
-import com.alibaba.excel.annotation.*;
@Schema(description = "管理后台 - 业务实例字段值 Response VO")
@Data
diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/templtp/vo/TmplInscItmBsnRespVO.java b/zt-module-base/zt-module-base-api/src/main/java/com/zt/plat/module/base/controller/admin/templtp/vo/TmplInscItmBsnRespVO.java
similarity index 98%
rename from zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/templtp/vo/TmplInscItmBsnRespVO.java
rename to zt-module-base/zt-module-base-api/src/main/java/com/zt/plat/module/base/controller/admin/templtp/vo/TmplInscItmBsnRespVO.java
index 0d509e8d..aa8ffef5 100644
--- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/templtp/vo/TmplInscItmBsnRespVO.java
+++ b/zt-module-base/zt-module-base-api/src/main/java/com/zt/plat/module/base/controller/admin/templtp/vo/TmplInscItmBsnRespVO.java
@@ -4,7 +4,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
import java.time.LocalDate;
-import java.util.*;
+
import com.alibaba.excel.annotation.*;
@Schema(description = "管理后台 - 业务实例条款值 Response VO")
diff --git a/zt-module-contract-order/zt-module-contract-order-api/pom.xml b/zt-module-contract-order/zt-module-contract-order-api/pom.xml
index fe89600a..778b875d 100644
--- a/zt-module-contract-order/zt-module-contract-order-api/pom.xml
+++ b/zt-module-contract-order/zt-module-contract-order-api/pom.xml
@@ -35,12 +35,22 @@
true
+
+ com.alibaba
+ easyexcel
+
org.springframework.cloud
spring-cloud-starter-openfeign
true
+
+ com.zt.plat
+ zt-module-base-api
+ ${revision}
+ compile
+
diff --git a/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/dto/contract/ContractReceiveSendRespDTO.java b/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/dto/contract/ContractReceiveSendRespDTO.java
index 7e765b6d..a98b1fcb 100644
--- a/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/dto/contract/ContractReceiveSendRespDTO.java
+++ b/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/dto/contract/ContractReceiveSendRespDTO.java
@@ -1,6 +1,5 @@
package com.zt.plat.module.contractorder.api.dto.contract;
-import com.alibaba.excel.annotation.ExcelProperty;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
@@ -11,54 +10,41 @@ import java.time.LocalDateTime;
@Data
public class ContractReceiveSendRespDTO {
@Schema(description = "主键ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "26349")
- @ExcelProperty("主键ID")
private Long id;
@Schema(description = "物料名称", example = "ZT")
- @ExcelProperty("物料名称")
private String materialName;
@Schema(description = "物料编码")
- @ExcelProperty("物料编码")
private String materialNumber;
@Schema(description = "元素缩写")
- @ExcelProperty("元素缩写")
private String elementAbbreviation;
@Schema(description = "元素名称", example = "张三")
- @ExcelProperty("元素名称")
private String elementName;
@Schema(description = "元素编码")
- @ExcelProperty("元素编码")
private String elementNumber;
@Schema(description = "类型(字典:CONTRACT_RECEIVING_SHIPPING_TYPE_RULES)", example = "2")
- @ExcelProperty("类型")
private String type;
@Schema(description = "规则(字典:CONTRACT_RECEIVING_SHIPPING_ALLOW_RULES)")
- @ExcelProperty("规则")
private String rule;
@Schema(description = "符号(字典:CONTRACT_RECEIVING_SHIPPING_SYMBOL_RULES)")
- @ExcelProperty("符号")
private String rangeWay;
@Schema(description = "区间下限")
- @ExcelProperty("区间下限")
private BigDecimal gradeDown;
@Schema(description = "区间上限")
- @ExcelProperty("区间上限")
private BigDecimal gradeUp;
@Schema(description = "合同id", example = "22162")
- @ExcelProperty("合同id")
private Long contractId;
@Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
- @ExcelProperty("创建时间")
private LocalDateTime createTime;
}
diff --git a/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/dto/order/SalesOrdDtlDTO.java b/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/dto/order/SalesOrdDtlDTO.java
index 8cfdd705..ece2cb3c 100644
--- a/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/dto/order/SalesOrdDtlDTO.java
+++ b/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/dto/order/SalesOrdDtlDTO.java
@@ -1,8 +1,5 @@
package com.zt.plat.module.contractorder.api.dto.order;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
import lombok.Data;
import java.math.BigDecimal;
diff --git a/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/vo/contract/DetailRespVO.java b/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/vo/contract/DetailRespVO.java
index 6a8b5e21..e23073c4 100644
--- a/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/vo/contract/DetailRespVO.java
+++ b/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/vo/contract/DetailRespVO.java
@@ -1,6 +1,5 @@
package com.zt.plat.module.contractorder.api.vo.contract;
-import com.baomidou.mybatisplus.annotation.TableField;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;