From aa3d1a0d6e0211ebd4c85a5ebd3847f64c59b4ac Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 27 一月 2026 10:05:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New' into dev_New
---
src/main/java/com/ruoyi/stock/execl/StockInventoryExportData.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/ruoyi/stock/execl/StockInventoryExportData.java b/src/main/java/com/ruoyi/stock/execl/StockInventoryExportData.java
index c3d17a1..e95ccf2 100644
--- a/src/main/java/com/ruoyi/stock/execl/StockInventoryExportData.java
+++ b/src/main/java/com/ruoyi/stock/execl/StockInventoryExportData.java
@@ -13,11 +13,13 @@
@Data
public class StockInventoryExportData {
+
+
@Excel(name = "浜у搧鍚嶇О")
- private String model;
+ private String productName;
@Excel(name = "瑙勬牸")
- private String productName;
+ private String model;
@Excel(name = "鍗曚綅")
private String unit;
--
Gitblit v1.9.3