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

云

昨天 a77decc3df26449414639082293e2ee6722e643c

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

@@ -5,6 +5,7 @@
import com.ruoyi.basic.dto.StorageBlobVO;
import com.ruoyi.sales.pojo.CommonFile;
import com.ruoyi.sales.pojo.ShippingInfo;
import com.ruoyi.sales.pojo.ShippingProductDetail;
import lombok.Data;

import java.util.List;
@@ -36,4 +37,9 @@
    private List<StorageBlobDTO> storageBlobDTOs;
    private List<StorageBlobVO> storageBlobVOs;

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



}