Merge branch 'master-fix' into release

yudao-module-product/yudao-module-product-rest/src/main/java/cn/iocoder/yudao/module/product/controller/admin/prod/ProdLinePriceController.java

@@ -55,7 +55,11 @@ public class ProdLinePriceController {
             it.setIsPriced(false);
             WarehouseInInfoParam warehouseInInfoVO = it.getWarehouseInInfoVO();
             if (Objects.nonNull(warehouseInInfoVO)){
-                it.setPackages(Arrays.asList(warehouseInInfoVO.getUnits().split(StrUtil.COMMA)));
+                if (StrUtil.isNotBlank(warehouseInInfoVO.getUnits())) {
+                    it.setPackages(Arrays.asList(warehouseInInfoVO.getUnits().split(StrUtil.COMMA)));
+                }else {
+                    it.setPackages(Arrays.asList(it.getUnit().split(StrUtil.COMMA)));
+                }
                 it.setVolume(warehouseInInfoVO.getVolume());
                 it.setWeight(warehouseInInfoVO.getWeight());
                 it.setQuantity(warehouseInInfoVO.getQuantityAll());