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

yudao-module-product/yudao-module-product-core/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/product/BasePrice.java

@@ -7,6 +7,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.math.BigDecimal;
+import java.util.List;
 
 @Data
 public class BasePrice extends BaseDO {
@@ -92,4 +93,21 @@ public class BasePrice extends BaseDO {
     @JsonIgnore
     private int productPriceEmptyType = 0;
 
+
+    @ApiModelProperty(value = "特殊需求列表")
+    @TableField(exist = false)
+    private List<ProductPriceSpecialDO> specialDOList;
+
+    @ApiModelProperty(value = "运费包装价格列表")
+    @TableField(exist = false)
+    private List<ProductPricePackagingDO> freightPricePackagingList;
+
+    @ApiModelProperty(value = "清关费包装价格列表")
+    @TableField(exist = false)
+    private List<ProductPricePackagingDO> clearancePricePackagingList;
+
+    @ApiModelProperty(value = "全包价包装价格列表")
+    @TableField(exist = false)
+    private List<ProductPricePackagingDO> fullPricePackagingList;
+
 }

yudao-module-product/yudao-module-product-core/src/main/java/cn/iocoder/yudao/module/product/vo/productPrice/ProductPriceReqBaseVO.java

 package cn.iocoder.yudao.module.product.vo.productPrice;
 
+import cn.iocoder.yudao.module.product.dal.dataobject.product.ProductPricePackagingDO;
+import cn.iocoder.yudao.module.product.dal.dataobject.product.ProductPriceSpecialDO;
 import cn.iocoder.yudao.module.product.dal.dataobject.product.ProductPriceStepDO;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;