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

gongchunyi

2 天以前 dfa9258c8879dbb0d1bfc00d7f939031d0bb623b

 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;
}