Merge remote-tracking branch 'origin/dev_天津_意博凯信' into dev_天津_意博凯信

gongchunyi

2026-08-12 c7ef427794795bddb10585eda2c5e43f0c2970bc

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

@@ -15,6 +15,7 @@
    private String productName;
    private String model;
    private String unit;
    private String batchNo;


    //入库类型