From 1ea84a23004ebcfaf86cb436d84164602ca9091d Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期五, 08 八月 2025 17:03:36 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/excel/AsnOrderTemplate.java | 18 ++++++++++++++++--
1 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/excel/AsnOrderTemplate.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/excel/AsnOrderTemplate.java
index d45f65c..dbcc443 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/excel/AsnOrderTemplate.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/excel/AsnOrderTemplate.java
@@ -54,13 +54,27 @@
@ExcelComment(value = "platItemId", example = "1357564255478")
private String platItemId;
+ @Excel(name = "瀹㈡埛璁㈠崟鍙�")
+ @ApiModelProperty("瀹㈡埛璁㈠崟鍙�")
+ @ExcelComment(value = "platOrderCode", example = "PT202564713301")
+ private String platOrderCode;
+
+ @Excel(name = "宸ュ崟鍙�")
+ @ApiModelProperty("宸ュ崟鍙�")
+ @ExcelComment(value = "platWorkCode", example = "PWC2354894211")
+ private String platWorkCode;
+
+ @Excel(name = "椤圭洰鍙�")
+ @ApiModelProperty("椤圭洰鍙�")
+ @ExcelComment(value = "projectCode", example = "PC2365845636001")
+ private String projectCode;
/**
* 鍗曟嵁绫诲瀷
*/
@Excel(name = "*鍗曟嵁绫诲瀷")
@ApiModelProperty(value = "*鍗曟嵁绫诲瀷")
- @ExcelComment(value = "type", example = "閲囪喘鍏ュ簱鍗�")
+ @ExcelComment(value = "type", example = "鍏ュ簱鍗�")
private String type;
/**
@@ -68,7 +82,7 @@
*/
@Excel(name = "*涓氬姟绫诲瀷")
@ApiModelProperty(value = "*涓氬姟绫诲瀷")
- @ExcelComment(value = "wkType", example = "瀹屽伐鍏ュ簱鍗�")
+ @ExcelComment(value = "wkType", example = "閲囪喘鍏ュ簱鍗�")
private String wkType;
--
Gitblit v1.9.1