From 1cf91e355038837f30f2d727507b2229263d7de7 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期二, 27 一月 2026 17:49:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New' into dev_New

---
 src/main/java/com/ruoyi/stock/dto/StockInRecordDto.java |    8 ++++++++
 1 files changed, 8 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 2ac682c..1aed75c 100644
--- a/src/main/java/com/ruoyi/stock/dto/StockInRecordDto.java
+++ b/src/main/java/com/ruoyi/stock/dto/StockInRecordDto.java
@@ -3,6 +3,7 @@
 import com.ruoyi.stock.pojo.StockInRecord;
 import lombok.Data;
 
+
 @Data
 public class StockInRecordDto extends StockInRecord {
     /**
@@ -17,4 +18,11 @@
      * 浜у搧鍗曚綅
      */
     private String unit;
+
+    private String timeStr;
+
+    private String createBy;
+
+    //鐜板瓨閲�
+    private String currentStock;
 }

--
Gitblit v1.9.3