Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang

puzhibing

2026-09-21 008ffb622f7e8b941245a4cf19042c7baef39b24

 ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/miniapp/AppActivityController.java

@@ -56,13 +56,13 @@
                shopId = member.getRelationShopId();
            }
        }
        Page<AppActivityPageVo> page = new Page<>();
        if(shopId==null){
            throw new ServiceException(AppErrorConstant.NO_POSITION);
            return R.ok(page);
        }
//        if(member!=null&&member.getBindingFlag()==0){
//            shopId = null;
//        }
        Page<AppActivityPageVo> page = new Page<>();
        page.setSize(appPageDto.getPageSize());
        page.setCurrent(appPageDto.getPageNum());
        List<AppActivityPageVo> activityPageVoList = activityService.pageAppActivity(page,shopId);