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

liyong

2 天以前 60806825951c111ac107dec87bd3acc5a7d6a707

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

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

    //现存量
    private String currentStock;

}