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

云

昨天 a77decc3df26449414639082293e2ee6722e643c

 src/main/java/com/ruoyi/sales/dto/ShippingInfoDto.java

@@ -1,10 +1,11 @@
package com.ruoyi.sales.dto;

import com.baomidou.mybatisplus.annotation.TableField;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import com.ruoyi.basic.dto.StorageBlobDTO;
import com.ruoyi.basic.dto.StorageBlobVO;
import com.ruoyi.sales.pojo.CommonFile;
import com.ruoyi.sales.pojo.ShippingInfo;
import io.swagger.annotations.ApiModelProperty;
import com.ruoyi.sales.pojo.ShippingProductDetail;
import lombok.Data;

import java.util.List;
@@ -29,4 +30,16 @@
    @TableField(exist = false)
    private List<CommonFile> commonFileList;

    private String  specificationModel;

    private String productName;

    private List<StorageBlobDTO> storageBlobDTOs;
    private List<StorageBlobVO> storageBlobVOs;

    private List<Long> batchNo;
    private List<ShippingProductDetail> batchNoDetailList;



}