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

zss

8 天以前 019c945c19ef6941adaea1f6d2f5e59649308892

 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;


    //入库类型