From 0bc2c552b180afa16e4aae3c8c12746b15ba6fc8 Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期四, 02 四月 2026 17:35:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_长治_健齿齿科器材' into dev_长治_健齿齿科器材

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

diff --git a/src/main/java/com/ruoyi/stock/execl/StockInventoryExportData.java b/src/main/java/com/ruoyi/stock/execl/StockInventoryExportData.java
index 86feed9..88a129c 100644
--- a/src/main/java/com/ruoyi/stock/execl/StockInventoryExportData.java
+++ b/src/main/java/com/ruoyi/stock/execl/StockInventoryExportData.java
@@ -1,5 +1,6 @@
 package com.ruoyi.stock.execl;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.framework.aspectj.lang.annotation.Excel;
 import lombok.Data;
 
@@ -16,12 +17,31 @@
     @Excel(name = "瑙勬牸")
     private String model;
 
+    @Excel(name = "UID鐮�")
+    private String uidNo;
+
+    @Excel(name = "鎵瑰彿")
+    private String batchNo;
+
+    @Excel(name = "鐢熶骇鏃ユ湡")
+    @JsonFormat(pattern = "yyyyMMdd")
+    private String productionDate;
+
+    @Excel(name = "渚涘簲鍟�")
+    private String customer;
+
     @Excel(name = "鍗曚綅")
     private String unit;
 
     @Excel(name = "搴撳瓨鏁伴噺")
     private BigDecimal qualitity;
 
+    @Excel(name = "棰勮鏁伴噺")
+    private BigDecimal warnNum;
+
+    @Excel(name = "鍐荤粨鏁伴噺")
+    private BigDecimal lockedQuantity;
+
     @Excel(name = "澶囨敞")
     private String remark;
 //

--
Gitblit v1.9.3