From 760b4f0509bbdc0605ea51060f4b844b315b625f Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 06 五月 2025 15:45:42 +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 | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 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 c8b8e13..c605541 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
@@ -60,13 +60,13 @@
*/
@Excel(name = "涓氬姟绫诲瀷")
@ApiModelProperty(value= "涓氬姟绫诲瀷")
- @ExcelComment(value = "wkType", example = "鐢熶骇鍏ュ簱")
+ @ExcelComment(value = "wkType", example = "瀹屽伐鍏ュ簱鍗�")
private String wkType;
@Excel(name = "鎵ц鐘舵��")
@ApiModelProperty(value= "鎵ц鐘舵��")
- @ExcelComment(value = "exceStatus", example = "1")
+ @ExcelComment(value = "exceStatus", example = "0")
private String exceStatus;
@Excel(name = "琛屽彿")
@@ -126,12 +126,12 @@
@Excel(name = "渚涘簲鍟嗙紪鐮�")
@ApiModelProperty("渚涘簲鍟嗙紪鐮�")
- @ExcelComment(value = "splrCode",example = "3654821")
+ @ExcelComment(value = "splrCode",example = "685947")
private String splrCode;
@Excel(name = "渚涘簲鍟嗗悕绉�")
@ApiModelProperty("渚涘簲鍟嗗悕绉�")
- @ExcelComment(value = "splrName",example = "娴欐睙涓壃鎶�鏈叕鍙�")
+ @ExcelComment(value = "splrName",example = "娴欐睙涓壃绔嬪簱鎶�鏈湁闄愬叕鍙�")
private String splrName;
@Excel(name = "渚涘簲鍟嗘壒娆�")
@@ -139,19 +139,19 @@
@ExcelComment(value = "splrBatch",example = "25251212")
private String splrBatch;
- @Excel(name = "浜岀淮鐮�")
- @ApiModelProperty("浜岀淮鐮�")
- @ExcelComment(value = "qrcode",example = "")
- private String qrcode;
+// @Excel(name = "浜岀淮鐮�")
+// @ApiModelProperty("浜岀淮鐮�")
+// @ExcelComment(value = "qrcode",example = "")
+// private String qrcode;
@Excel(name = "鏉″舰鐮�")
@ApiModelProperty("鏉″舰鐮�")
- @ExcelComment(value = "barcode",example = "2354788")
+ @ExcelComment(value = "barcode",example = "")
private String barcode;
@Excel(name = "璺熻釜鐮�")
@ApiModelProperty("璺熻釜鐮�")
- @ExcelComment(value = "trackCode",example = "2354788")
+ @ExcelComment(value = "trackCode",example = "")
private String trackCode;
@Excel(name = "鍖呰鍚嶇О")
--
Gitblit v1.9.1