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

gongchunyi

6 天以前 a10faaa8d2a80f0302c35a5d73dcb7b3fb069133

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

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

    //现存量
    private String currentStock;

}