From 0365eb9f81bd331b0adde6d77fb331213a2c7b30 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期二, 12 五月 2026 13:40:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_浪潮_pro

---
 src/main/java/com/ruoyi/basic/dto/ProductModelExportDto.java |    3 +++
 1 files changed, 3 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 4e5688f..f0a199b 100644
--- a/src/main/java/com/ruoyi/basic/dto/ProductModelExportDto.java
+++ b/src/main/java/com/ruoyi/basic/dto/ProductModelExportDto.java
@@ -24,4 +24,7 @@
     @Excel(name = "鍗曚綅")
     private String unit;
 
+    @Excel(name = "搴撳瓨閲�")
+    private String stockInventory;
+
 }

--
Gitblit v1.9.3