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

buhuazhen

6 天以前 4e833109c2105bf6895ac985205ce30da37c70d6

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

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

    //现存量
    private String currentStock;

}