Merge remote-tracking branch 'origin/dev_浪潮_pro' into dev_浪潮_pro

liyong

2026-05-09 67fda7b2dfbfc9e6a8d8b9472499a67906d2bad1

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

@@ -2,8 +2,10 @@

import com.baomidou.mybatisplus.annotation.TableField;
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 com.ruoyi.sales.pojo.ShippingProductDetail;
import lombok.Data;

import java.util.List;
@@ -33,5 +35,11 @@
    private String productName;

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

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



}