Merge branch 'master' of https://gitea.zianxin.com/zax/biz-api-cloud

pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/MallAppController.java

@@ -220,7 +220,9 @@ public class MallAppController {
 //            }
             
             return mallMerchantListAppVo;
-        }).collect(Collectors.toList());
+        })
+        .filter(vo -> vo.getProductCount() > 0) // 过滤掉没有商品的商户
+        .collect(Collectors.toList());
 
         return R.ok(result);
     }