From 03386a78c3a1f92efa21a6748e38c2c5d1c996d9 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期二, 27 一月 2026 10:57:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New' into dev_New
---
src/main/java/com/ruoyi/stock/dto/StockInRecordDto.java | 6 ++++++
1 files changed, 6 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..5c58f53 100644
--- a/src/main/java/com/ruoyi/stock/dto/StockInRecordDto.java
+++ b/src/main/java/com/ruoyi/stock/dto/StockInRecordDto.java
@@ -1,5 +1,6 @@
package com.ruoyi.stock.dto;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import com.ruoyi.stock.pojo.StockInRecord;
import lombok.Data;
@@ -20,4 +21,9 @@
private String unit;
private String timeStr;
+
+ private String createBy;
+
+ //鐜板瓨閲�
+ private String currentStock;
}
--
Gitblit v1.9.3