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

zss

2026-04-23 5033c375a3ee6a63bcb600d5b9f4b8d549d089e2

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

@@ -20,4 +20,10 @@
    private String unit;

    private String timeStr;

    private String createBy;

    //现存量
    private String currentStock;

}