Merge remote-tracking branch 'origin/master'

# Conflicts:
#	yudao-module-shipment/yudao-module-shipment-core/src/main/java/cn/iocoder/yudao/module/shipment/service/makeBillOfLading/MakeBillOfLadingServiceImpl.java

yudao-module-shipment/yudao-module-shipment-core/src/main/java/cn/iocoder/yudao/module/shipment/service/makeBillOfLading/MakeBillOfLadingServiceImpl.java

@@ -444,11 +444,17 @@ public class MakeBillOfLadingServiceImpl extends AbstractService<MakeBillOfLadin
 //            }
             paramMap.put("seaFreight", item.getOneSeaFreight() + currencyMap.get(item.getSeaFreightCurrency()) + "/m³");
             if (item.getOneClearanceFreight().compareTo(BigDecimal.ZERO) == 0) {
-                //paramMap.put("clearanceFreight", "");
-                //lanbm 2024-04-29 修改为0的显示
-                paramMap.put("clearanceFreight", "0" + currencyMap.get(item.getClearanceFreightCurrency()) + "/m³");
+                if (item.getClearanceFreightCurrency() == null) {
+                    paramMap.put("clearanceFreight", "0");
+                } else {
+                    paramMap.put("clearanceFreight",
+                            "0" + currencyMap.get(item.getClearanceFreightCurrency()) + "/m³");
+                    //paramMap.put("clearanceFreight", "");
+                    //lanbm 2024-04-25 update 提单制作，清关价为0问题修改
+                }
             } else {
-                paramMap.put("clearanceFreight", item.getOneClearanceFreight() + currencyMap.get(item.getClearanceFreightCurrency()) + "/m³");
+                paramMap.put("clearanceFreight",
+                        item.getOneClearanceFreight() + currencyMap.get(item.getClearanceFreightCurrency()) + "/m³");
             }
             return paramMap;
         }).collect(Collectors.toList());
@@ -750,7 +756,7 @@ public class MakeBillOfLadingServiceImpl extends AbstractService<MakeBillOfLadin
             }
             if (makeBillOfLadingListBackVO.getDraweeCode() == 1) {
                 makeBillOfLadingListBackVO.setDrawee("付款人=发货人");
-            } else if(makeBillOfLadingListBackVO.getDraweeCode() == 3) {
+            } else if (makeBillOfLadingListBackVO.getDraweeCode() == 3) {
                 makeBillOfLadingListBackVO.setDrawee("付款人=自定义");
             }
 //            List typeList = new ArrayList();