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

gongchunyi

3 天以前 cd2aafde048f46bd7123ec6cc773d7200172ee04

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

@@ -25,4 +25,5 @@

    //现存量
    private String currentStock;

}