From 3f1d871318231ebabb3be06c4ca2ca770b5b0220 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期四, 19 三月 2026 09:59:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_kthg' into dev_New_kthg
---
src/main/java/com/ruoyi/stock/dto/StockInRecordDto.java | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ruoyi/stock/dto/StockInRecordDto.java b/src/main/java/com/ruoyi/stock/dto/StockInRecordDto.java
index 4d6540c..c60d7f6 100644
--- a/src/main/java/com/ruoyi/stock/dto/StockInRecordDto.java
+++ b/src/main/java/com/ruoyi/stock/dto/StockInRecordDto.java
@@ -1,8 +1,9 @@
package com.ruoyi.stock.dto;
-import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import com.ruoyi.stock.pojo.StockInRecord;
import lombok.Data;
+
+import java.math.BigDecimal;
@Data
@@ -23,4 +24,13 @@
private String timeStr;
private String createBy;
+
+ //鐜板瓨閲�
+ private String currentStock;
+
+ //鐜板噣閲�
+ private BigDecimal currentWeight;
+
+ //浜у搧绫诲瀷
+ private String productType;
}
--
Gitblit v1.9.3