Merge remote-tracking branch 'origin/dev_New_kthg' into dev_New_kthg

gongchunyi

2026-03-05 0907687e631c643a4cf0d41c1d2d4a645e69f0a7

 src/main/java/com/ruoyi/stock/dto/StockInRecordDto.java

@@ -1,6 +1,5 @@
package com.ruoyi.stock.dto;

import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import com.ruoyi.stock.pojo.StockInRecord;
import lombok.Data;

@@ -23,4 +22,8 @@
    private String timeStr;

    private String createBy;

    //现存量
    private String currentStock;

}