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

gongchunyi

2026-02-09 7791d7493f1d9c484bdfa471d76424a8750da08d

 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;

@@ -26,4 +25,5 @@

    //现存量
    private String currentStock;

}