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

zss

8 天以前 3e5315bf1913ec325697f22104fcd2758c98891a

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

@@ -18,6 +18,11 @@
     */
    private String model;
    /**
     * 批次号
     */
    private String batchNo;

    /**
     * 产品单位
     */
    private String unit;