From add402ec68d150cd8b13c231ce991cf49889259c Mon Sep 17 00:00:00 2001
From: skyouc <958836976@qq.com>
Date: 星期二, 21 十月 2025 14:03:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/devlop_whxrwms' into devlop_whxrwms
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/excel/OutStockTemplate.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/excel/OutStockTemplate.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/excel/OutStockTemplate.java
index 8a67839..839c006 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/excel/OutStockTemplate.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/excel/OutStockTemplate.java
@@ -68,7 +68,7 @@
*/
@Excel(name = "*鍗曟嵁绫诲瀷")
@ApiModelProperty(value = "*鍗曟嵁绫诲瀷")
- @ExcelComment(value = "type", example = "鍏ュ簱鍗�")
+ @ExcelComment(value = "type", example = "鍑哄簱鍗�")
private String type;
/**
@@ -76,7 +76,7 @@
*/
@Excel(name = "*涓氬姟绫诲瀷")
@ApiModelProperty(value = "*涓氬姟绫诲瀷")
- @ExcelComment(value = "wkType", example = "閲囪喘鍏ュ簱鍗�")
+ @ExcelComment(value = "wkType", example = "閿�鍞嚭搴撳崟")
private String wkType;
--
Gitblit v1.9.1