From 1b6ccb5ac0edeb3c7f2ca9035c87b6ec24209c2f Mon Sep 17 00:00:00 2001
From: buhuazhen <hua100783@gmail.com>
Date: 星期三, 22 四月 2026 14:35:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_天津_阳光彩印' into dev_天津_阳光彩印

---
 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 5419ced..fa5602a 100644
--- a/src/main/java/com/ruoyi/stock/dto/StockInRecordDto.java
+++ b/src/main/java/com/ruoyi/stock/dto/StockInRecordDto.java
@@ -20,4 +20,12 @@
     private String unit;
 
     private String timeStr;
+
+    private String createBy;
+
+    //鐜板瓨閲�
+    private String currentStock;
+
+    private String rootName;
+
 }

--
Gitblit v1.9.3