From 14de446d42a23f8823f56ef79214e0d0d634adaa Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 22 一月 2026 16:57:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New' into dev_New

---
 src/main/java/com/ruoyi/stock/dto/StockInRecordDto.java |    3 +++
 1 files changed, 3 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..4d6540c 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,6 @@
     private String unit;
 
     private String timeStr;
+
+    private String createBy;
 }

--
Gitblit v1.9.3