Merge remote-tracking branch 'origin/dev_New_pro' into dev_鹤壁_强信宇_pro

yuan

10 天以前 c7d9ef156e031165f6b0f2d949a6500db9f03bd1

 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;


    //入库类型