Merge branch 'dev/2024/1101/update-app-Y' of feifan/mall-backend-app into master

更新分类

feifan-module-mall/feifan-module-product-biz/src/main/java/cn/newfeifan/mall/module/product/service/category/ProductCategoryServiceImpl.java

@@ -169,6 +169,7 @@ public class ProductCategoryServiceImpl implements ProductCategoryService {
 
     @Override
     public List<ProductCategoryDO> getEnableCategoryList(Long merchantId, Long shopId) {
+        // 分为商城和店铺
         if(merchantId != null && shopId != null) {
             List<ProductSpuDO> spuDOS = productSpuService.getSpuListByMerchantIdAndShopId(merchantId, shopId);
             List<Long> categoryIds = spuDOS.stream().map(ProductSpuDO::getCategoryId).distinct().collect(Collectors.toList());