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

liyong

6 天以前 fe82da7485601580104c058f382405cc0cc9e043

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

@@ -1,7 +1,10 @@
package com.ruoyi.stock.dto;

import com.ruoyi.stock.pojo.StockInRecord;
import lombok.Data;


@Data
public class StockInRecordDto extends StockInRecord {
    /**
     * 产品名称
@@ -15,4 +18,6 @@
     * 产品单位
     */
    private String unit;

    private String timeStr;
}