Merge branch 'master-fix' into dev

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

@@ -96,7 +96,7 @@ public class BasePrice extends BaseDO {
 
     @ApiModelProperty(value = "特殊需求列表")
     @TableField(exist = false)
-    private List<ProductPriceSpecialDO> specialList;
+    private List<ProductPriceSpecialDO> specialDOList;
 
     @ApiModelProperty(value = "运费包装价格列表")
     @TableField(exist = false)

yudao-module-product/yudao-module-product-core/src/main/java/cn/iocoder/yudao/module/product/service/product/impl/ProductPriceServiceImpl.java

@@ -3463,7 +3463,7 @@ public class ProductPriceServiceImpl extends AbstractService<ProductPriceMapper,
                 lineChannelList.add(vo);
                 createReqVO.setLineChannelList(lineChannelList);
                 ProductPriceRespVO respVO = this.getProductPriceDetail(price.getId());
-                price.setSpecialList(respVO.getSpecialList());
+                price.setSpecialDOList(respVO.getSpecialList());
                 //阶梯运费价格列表
                 List<ProductPriceStepDO> freightPriceStepList = new ArrayList<>();
                 //阶梯清关费价格列表
@@ -3641,8 +3641,8 @@ public class ProductPriceServiceImpl extends AbstractService<ProductPriceMapper,
         if (productPriceDO.getStepPrice() == 1) {
             copyStepPrice(stepList, transportType, productPriceDO, dbStepMap, insertList1, productPricePackagingDOS, updateList);
         } else {
-            if (CollectionUtil.isNotEmpty(productPriceDO.getSpecialList())) {
-                for (ProductPriceSpecialDO specialDO : productPriceDO.getSpecialList()) {
+            if (CollectionUtil.isNotEmpty(productPriceDO.getSpecialDOList())) {
+                for (ProductPriceSpecialDO specialDO : productPriceDO.getSpecialDOList()) {
                     ProductPriceSpecialDO priceSpecialDO = new ProductPriceSpecialDO();
                     BeanUtils.copyProperties(specialDO, priceSpecialDO);
                     priceSpecialDO.setId(null);