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

maven

18 小时以前 03386a78c3a1f92efa21a6748e38c2c5d1c996d9

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

@@ -23,4 +23,7 @@
    private String timeStr;

    private String createBy;

    //现存量
    private String currentStock;
}