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

buhuazhen

5 天以前 706d0d62cc25829ec6948e2fd5d03e62acf29306

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

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

    //现存量
    private String currentStock;

}