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

liyong

5 天以前 1765150bd38a53f6466a6e355f231e21f25fc9f2

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