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

云

7 天以前 4e11972ecb0ab80de695319878c18ca504655c00

 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;


    //入库类型