Merge branch 'master-fix' into dev

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

@@ -994,7 +994,7 @@ public class ProductPriceServiceImpl extends AbstractService<ProductPriceMapper,
                 });
             } else {
                 Map<String, ProductPriceSpecialDO> dictTypeMap = productPriceSpecialDOList.stream()
-                        .collect(Collectors.toMap(ProductPriceSpecialDO::getSpecialDictType, v -> v));
+                        .collect(Collectors.toMap(ProductPriceSpecialDO::getSpecialDictType, v -> v,  (v1,v2) -> v2));
                 specialList.forEach(t -> {
                     String dictType = t.getSpecialDictType();
                     ProductPriceSpecialDO productPriceSpecialDO = dictTypeMap.get(dictType);