From d80c1fe5bc2b604a27c2e985ea7593ba6618cc37 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期一, 02 二月 2026 11:18:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New' into dev_New

---
 src/main/java/com/ruoyi/stock/dto/StockInRecordDto.java |   11 +++++++++++
 1 files changed, 11 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 312eec9..9f47fd6 100644
--- a/src/main/java/com/ruoyi/stock/dto/StockInRecordDto.java
+++ b/src/main/java/com/ruoyi/stock/dto/StockInRecordDto.java
@@ -1,7 +1,10 @@
 package com.ruoyi.stock.dto;
 
 import com.ruoyi.stock.pojo.StockInRecord;
+import lombok.Data;
 
+
+@Data
 public class StockInRecordDto extends StockInRecord {
     /**
      * 浜у搧鍚嶇О
@@ -15,4 +18,12 @@
      * 浜у搧鍗曚綅
      */
     private String unit;
+
+    private String timeStr;
+
+    private String createBy;
+
+    //鐜板瓨閲�
+    private String currentStock;
+
 }

--
Gitblit v1.9.3