Merge remote-tracking branch 'origin/master'

luodangjia

2024-12-16 f28142767f8823667499e6e94a76789f601f1654

 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/ShopServiceImpl.java

@@ -49,8 +49,7 @@
        Page<Shop> page = new Page<>();
        page.setCurrent(PageNum);
        page.setSize(pageSize);
        IPage<Shop> shopIPage = shopMapper.selectShopList(page, shop);
        return shopIPage;
        return shopMapper.selectShopList(page, shop);
    }

    @Override