From b4a9e12e00b78e1aef8acda070434de9ffd0d66a Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期五, 24 四月 2026 15:29:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro
---
src/main/java/com/ruoyi/stock/dto/StockInRecordDto.java | 13 +++++++++++++
1 files changed, 13 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..05c1960 100644
--- a/src/main/java/com/ruoyi/stock/dto/StockInRecordDto.java
+++ b/src/main/java/com/ruoyi/stock/dto/StockInRecordDto.java
@@ -1,7 +1,9 @@
package com.ruoyi.stock.dto;
import com.ruoyi.stock.pojo.StockInRecord;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
+
@Data
public class StockInRecordDto extends StockInRecord {
@@ -17,4 +19,15 @@
* 浜у搧鍗曚綅
*/
private String unit;
+
+ private String timeStr;
+
+ private String createBy;
+
+ //鐜板瓨閲�
+ private String currentStock;
+
+ @Schema(description = "椤堕儴鐖朵骇鍝乮d")
+ private Long topParentProductId;
+
}
--
Gitblit v1.9.3