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

zss

18 小时以前 599b5ff692722226d1e30fbdffc594b826bfa815

 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;

@@ -26,4 +25,5 @@

    //现存量
    private String currentStock;

}