Merge remote-tracking branch 'origin/dev_天津_阳光彩印' into dev_天津_阳光彩印

buhuazhen

昨天 5de00e436cb41dee07b75c20391db7bc0a5b3660

 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;

}