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/stock/dto/StockInRecordDto.java | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/stock/dto/StockInRecordDto.java b/src/main/java/com/ruoyi/stock/dto/StockInRecordDto.java
index 5419ced..b640ec9 100644
--- a/src/main/java/com/ruoyi/stock/dto/StockInRecordDto.java
+++ b/src/main/java/com/ruoyi/stock/dto/StockInRecordDto.java
@@ -3,6 +3,8 @@
import com.ruoyi.stock.pojo.StockInRecord;
import lombok.Data;
+import java.math.BigDecimal;
+
@Data
public class StockInRecordDto extends StockInRecord {
@@ -20,4 +22,12 @@
private String unit;
private String timeStr;
+
+ private String createBy;
+
+ //鐜板瓨閲�
+ private String currentStock;
+
+ //鐜板噣閲�
+ private BigDecimal currentWeight;
}
--
Gitblit v1.9.3