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

maven

昨天 e896ea812c8121b01d2108b259c96d71baccb368

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

@@ -20,4 +20,9 @@
    private String unit;

    private String timeStr;

    private String createBy;

    //现存量
    private String currentStock;
}