Merge branch 'dev' into 'master'

清关费也以收费值进行匹配

See merge request !5

yudao-module-product/yudao-module-product-core/src/main/java/cn/iocoder/yudao/module/product/component/ProdCostCalculation.java

@@ -1492,9 +1492,10 @@ public class ProdCostCalculation {
                             lineChannelPackagingDO.getClearancePriceUnit());
                     lineClearanceBasePrice.setClearanceVolumeUnit(
                             lineChannelPackagingDO.getClearanceVolumeUnit());
+                    // TODO 清关费也以收费值进行匹配
                     BigDecimal lineClearanceNum =
                             this.calculationUnitAsValue(prodParam,
-                                    productPriceDO, lineClearanceUnitDO, 0);
+                                    productPriceDO, lineClearanceUnitDO, 1);
 
                     if (lineClearanceNum != null) {
                         zTest3 z = new zTest3();