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

liyong

7 天以前 dee56ed8d52f1d8ee1f89b369561c49e9b3b7c2d

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

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

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

@@ -20,4 +21,6 @@
    private String unit;

    private String timeStr;

    private String createBy;
}