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

maven

2 天以前 e099d0cd93c26b44bc1c10e51944edfad0465b0c

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

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

    //现存量
    private String currentStock;

}