Merge branch 'master' of http://sinata.cn:10101/gitblit/r/java/HongRuiTang

jiangqs

2023-06-04 3f7a3aefe2965459aed169383b285fba400cfe8c

 ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/shop/ShopService.java

@@ -75,6 +75,7 @@
    Shop getByShopId(Long shopId);



    /**
     * 获取商户端首页统计
     * @param userId
@@ -89,7 +90,6 @@
     * @return
     */
    List<MerAgencyPageVo> pageMerAgencyVo (Page page, MerAgencyPageDto merAgencyPageDto);



}