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

liyong

4 天以前 80c45ea7934443bea5355bc6bace96ec23a58600

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

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

    private String createBy;

    //现存量
    private String currentStock;
}