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

liyong

7 天以前 2f22c6ea825cc32975dfa4eaaa23649c6f633682

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

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

    //现存量
    private String currentStock;

}