Merge branch 'refs/heads/dev_New' into dev_New_kthg

liding

18 小时以前 1a3f5db043fd381b60a0a5f40687136274a2cbd1

 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;

}