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

maven

2026-03-19 3f1d871318231ebabb3be06c4ca2ca770b5b0220

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

@@ -30,4 +30,7 @@

    //现净重
    private BigDecimal currentWeight;

    //产品类型
    private String productType;
}