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

maven

4 天以前 6d5f8d5dd6f337837c7a0007639490afe3c7409c

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

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

    //现存量
    private String currentStock;

}