From a122cfc45d18b6e679029a88eb342e9081df6595 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期二, 12 五月 2026 09:14:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_浪潮_pro
---
src/main/java/com/ruoyi/basic/dto/ProductModelExportDto.java | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/basic/dto/ProductModelExportDto.java b/src/main/java/com/ruoyi/basic/dto/ProductModelExportDto.java
index c8c838a..f0a199b 100644
--- a/src/main/java/com/ruoyi/basic/dto/ProductModelExportDto.java
+++ b/src/main/java/com/ruoyi/basic/dto/ProductModelExportDto.java
@@ -15,10 +15,16 @@
@Data
public class ProductModelExportDto {
+ @Excel(name = "浜у搧缂栫爜")
+ private String productCode;
+
@Excel(name = "瑙勬牸鍨嬪彿")
private String model;
@Excel(name = "鍗曚綅")
private String unit;
+ @Excel(name = "搴撳瓨閲�")
+ private String stockInventory;
+
}
--
Gitblit v1.9.3