From 2cf52f66f3e7ffd415dbf49eb74aed441871f3a4 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期五, 23 一月 2026 17:52:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New' into dev_New
---
src/main/java/com/ruoyi/stock/execl/StockInventoryExportData.java | 18 ++++++++++++++++--
1 files changed, 16 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 8937fbb..e95ccf2 100644
--- a/src/main/java/com/ruoyi/stock/execl/StockInventoryExportData.java
+++ b/src/main/java/com/ruoyi/stock/execl/StockInventoryExportData.java
@@ -1,19 +1,28 @@
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 {
+
+
@Excel(name = "浜у搧鍚嶇О")
- private String model;
+ private String productName;
@Excel(name = "瑙勬牸")
- private String productName;
+ private String model;
+
+ @Excel(name = "鍗曚綅")
+ private String unit;
@Excel(name = "搴撳瓨鏁伴噺")
private BigDecimal qualitity;
@@ -21,4 +30,9 @@
@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;
+
}
--
Gitblit v1.9.3