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

liding

2026-03-16 3322c20909d2cc762b9a7a4a4c8b2bb728ebebd9

 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
@@ -26,4 +27,7 @@

    //现存量
    private String currentStock;

    //现净重
    private BigDecimal currentWeight;
}