From 9e33d74a62e8b2b37c2f1c290a88392d352e8ece Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期五, 03 四月 2026 10:57:59 +0800
Subject: [PATCH] yys

---
 src/main/java/com/ruoyi/stock/execl/StockInventoryExportData.java |   24 ++++++++++++++----------
 1 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/ruoyi/stock/execl/StockInventoryExportData.java b/src/main/java/com/ruoyi/stock/execl/StockInventoryExportData.java
index e95ccf2..806f02c 100644
--- a/src/main/java/com/ruoyi/stock/execl/StockInventoryExportData.java
+++ b/src/main/java/com/ruoyi/stock/execl/StockInventoryExportData.java
@@ -1,14 +1,9 @@
 package com.ruoyi.stock.execl;
 
-import com.alibaba.excel.annotation.ExcelProperty;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.framework.aspectj.lang.annotation.Excel;
 import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
 
 import java.math.BigDecimal;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
 
 @Data
 public class StockInventoryExportData {
@@ -18,7 +13,7 @@
     @Excel(name = "浜у搧鍚嶇О")
     private String productName;
 
-    @Excel(name = "瑙勬牸")
+    @Excel(name = "鍥剧焊缂栧彿")
     private String model;
 
     @Excel(name = "鍗曚綅")
@@ -27,12 +22,21 @@
     @Excel(name = "搴撳瓨鏁伴噺")
     private BigDecimal qualitity;
 
+    @Excel(name = "棰勮鏁伴噺")
+    private BigDecimal warnNum;
+
+    @Excel(name = "鍐荤粨鏁伴噺")
+    private BigDecimal lockedQuantity;
+
     @Excel(name = "澶囨敞")
     private String remark;
 
-    @Excel(name = "鏈�鏂版洿鏂版椂闂�")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private LocalDateTime updateTime;
+    @Excel(name = "搴撲綅")
+    private String stockLocation;
+//
+//    @Excel(name = "鏈�鏂版洿鏂版椂闂�")
+//    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+//    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+//    private LocalDateTime updateTime;
 
 }

--
Gitblit v1.9.3