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

zss

2026-04-23 5033c375a3ee6a63bcb600d5b9f4b8d549d089e2

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

@@ -4,7 +4,7 @@
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import com.ruoyi.sales.pojo.CommonFile;
import com.ruoyi.sales.pojo.ShippingInfo;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;

import java.util.List;