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

liyong

2026-04-23 a228c5f91173c50ce7f94255dc9a25a7c6703e0c

 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;
@@ -29,4 +29,8 @@
    @TableField(exist = false)
    private List<CommonFile> commonFileList;

    private String  specificationModel;

    private String productName;

}