Merge remote-tracking branch 'origin/dev_天津_阳光彩印' into dev_天津_阳光彩印

liyong

3 天以前 8a71194e0cd81a39637bc9c5adbd8c9d1405f155

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

@@ -25,4 +25,7 @@

    //现存量
    private String currentStock;

    private String rootName;

}