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

liyong

6 天以前 f5ee8e7afb178179c1d1d078cf42fe33dc7607f9

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

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

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