Merge remote-tracking branch 'origin/master'

Pu Zhibing

2025-01-15 187a4cbcd2a0254d607058f93b13b456a997d38a

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

@@ -93,7 +93,7 @@
            }

            Shop shop = shopMapper.selectById(appUser.getShopId());
            if(null != shop){
            if(null != shop && shop.getDelFlag() == 0 && shop.getStatus() == 1){
                NearbyShopVO vo = new NearbyShopVO();
                vo.setId(appUser.getShopId().longValue());
                vo.setName(shop.getName());