Merge branch 'dev_New' into dev_宁夏_中盛建材

zss

8 天以前 43113d6b1670530dfb4348836fd491c79f36af0a

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

@@ -20,4 +20,10 @@
    private String unit;

    private String timeStr;

    private String createBy;

    //现存量
    private String currentStock;

}