Merge branch 'master-fix' into dev

# Conflicts:
#	yudao-module-product/yudao-module-product-core/src/main/java/cn/iocoder/yudao/module/product/listener/ProductPriceExcelExportListener.java

yudao-module-product/yudao-module-product-core/src/main/java/cn/iocoder/yudao/module/product/listener/ProductPriceExcelExportListener.java

@@ -282,7 +282,7 @@ public class ProductPriceExcelExportListener {
                                             String unit = "";
                                             if (weightUnit != null) {
                                                 UnitDO unitDO = unitMap.get(weightUnit.intValue());
-                                                unit = unitDO.getTitleZh();
+                                                unit = Objects.nonNull(unitDO) ? unitDO.getTitleZh() : "空";
                                             }
                                             BigDecimal startNum = stepDO.getStartNum();
                                             BigDecimal endNum = stepDO.getEndNum();