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

liyong

19 小时以前 168b0d2b658fffb2cf3fd1cf569a6c7b25c36a47

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

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

    private String timeStr;

    private String createBy;

    //现存量
    private String currentStock;

}