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/dto/ConsumablesInRecordDto.java | 38 ++++++++++++++++++++++++++++++++++++++
1 files changed, 38 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/consumables/dto/ConsumablesInRecordDto.java b/src/main/java/com/ruoyi/consumables/dto/ConsumablesInRecordDto.java
new file mode 100644
index 0000000..06b146e
--- /dev/null
+++ b/src/main/java/com/ruoyi/consumables/dto/ConsumablesInRecordDto.java
@@ -0,0 +1,38 @@
+package com.ruoyi.consumables.dto;
+
+import com.ruoyi.consumables.pojo.ConsumablesInRecord;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.math.BigDecimal;
+
+
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class ConsumablesInRecordDto extends ConsumablesInRecord {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 浜у搧鍚嶇О
+ */
+ private String productName;
+ /**
+ * 浜у搧瑙勬牸
+ */
+ private String model;
+ /**
+ * 浜у搧鍗曚綅
+ */
+ private String unit;
+
+ private String timeStr;
+
+ private String createBy;
+
+ //鐜板瓨閲�
+ private String currentconsumables;
+
+ //鐜板噣閲�
+ private BigDecimal currentWeight;
+}
--
Gitblit v1.9.3