Merge remote-tracking branch 'refs/remotes/origin/dev_New_pro' into dev_长治_...

liyong

8 天以前 255efac022d9244f1964c420ca4ca3bc3b839ede

 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;


    //入库类型