From d7bb8c43b17253b46c6a466cff5545e8b4bcaad3 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 10 六月 2025 11:10:46 +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/DeliveryTemplate.java | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/excel/DeliveryTemplate.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/excel/DeliveryTemplate.java
index 69ccd27..6bcd33f 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/excel/DeliveryTemplate.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/excel/DeliveryTemplate.java
@@ -17,8 +17,8 @@
private static final long serialVersionUID = 1L;
@Excel(name = "*DO鍗曞彿")
- @ApiModelProperty(value= "*PO鍗曞彿")
- @ExcelComment(value = "poCode", example = "PO25413975")
+ @ApiModelProperty(value= "*DO鍗曞彿")
+ @ExcelComment(value = "doCode", example = "DO25413975")
private String doCode;
@Excel(name = "*琛屽彿")
@@ -76,7 +76,7 @@
@Excel(name = "鐗╂枡鍚嶇О")
@ApiModelProperty(value= "鐗╂枡鍚嶇О")
@ExcelComment(value = "matnrName", example = "TC-03128瀵歌繛浣撳唴涓婃墭")
- private String matnrName;
+ private String maktx;
/**
@@ -103,6 +103,14 @@
@ExcelComment(value = "splrBatch", example = "20250401")
private String splrBatch;
+ /**
+ * 渚涘簲鍟嗗悕绉�
+ */
+ @Excel(name = "渚涘簲鍟嗗悕绉�")
+ @ApiModelProperty(value= "渚涘簲鍟嗗悕绉�")
+ @ExcelComment(value = "splrName", example = "涓壃绔嬪簱鎶�鏈湁闄愬叕鍙�")
+ private String splrName;
+
@Excel(name = "棰勮閫佽揪鏃堕棿")
@ApiModelProperty("棰勮閫佽揪鏃堕棿")
--
Gitblit v1.9.1