From 1d915922d8197aa5d5dc3e40e3088d983dd6e141 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期五, 13 三月 2026 17:57:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_kthg' into dev_New_kthg
---
src/main/java/com/ruoyi/consumables/execl/ConsumablesOutRecordExportData.java | 31 +++++++++++++++++++++++++++++++
1 files changed, 31 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/consumables/execl/ConsumablesOutRecordExportData.java b/src/main/java/com/ruoyi/consumables/execl/ConsumablesOutRecordExportData.java
new file mode 100644
index 0000000..3e8f65f
--- /dev/null
+++ b/src/main/java/com/ruoyi/consumables/execl/ConsumablesOutRecordExportData.java
@@ -0,0 +1,31 @@
+package com.ruoyi.consumables.execl;
+
+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.time.LocalDateTime;
+
+@Data
+public class ConsumablesOutRecordExportData {
+ @Excel(name = "鍑哄簱鎵规")
+ private String outboundBatches;
+ @Excel(name = "浜у搧鍚嶇О")
+ private String productName;
+ @Excel(name = "瑙勬牸鍨嬪彿")
+ private String model;
+ @Excel(name = "鍗曚綅")
+ private String unit;
+ @Excel(name = "鍑哄簱鏉ユ簮")
+ private String recordType;
+ @Excel(name = "鍑哄簱鏁伴噺")
+ private String ConsumablesInNum;
+ @Excel(name = "鍑哄簱鏃堕棿")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime createTime;
+
+ @Excel(isExport = false)
+ private String type;
+}
--
Gitblit v1.9.3