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

liyong

昨天 3b94346fea3e6bdc74232615a11a764d0481383a

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

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

    //现存量
    private String currentStock;

}