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

liyong

9 天以前 408bab8b1c0c10514b8395cff92e47751e4dcdcd

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

@@ -1,6 +1,5 @@
package com.ruoyi.stock.dto;

import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import com.ruoyi.stock.pojo.StockInRecord;
import lombok.Data;

@@ -23,4 +22,8 @@
    private String timeStr;

    private String createBy;

    //现存量
    private String currentStock;

}