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

yuan

2026-04-24 b4a9e12e00b78e1aef8acda070434de9ffd0d66a

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

@@ -2,6 +2,7 @@

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 lombok.Data;
@@ -33,5 +34,6 @@
    private String productName;

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

}