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

liyong

13 小时以前 1cf91e355038837f30f2d727507b2229263d7de7

 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,7 @@
    private String timeStr;

    private String createBy;

    //现存量
    private String currentStock;
}