Merge remote-tracking branch 'origin/dev' into dev

xuhy

2025-08-26 4deac7de8ec77a4de569a91b9790778d669e8e0f

 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopController.java

@@ -258,6 +258,7 @@
        //删除客服电话
        QueryWrapper<Phone> queryWrapper = new QueryWrapper<>();
        queryWrapper.eq("shop_id", shop.getId());
        queryWrapper.eq("type",2);
        Phone one = phoneService.getOne(queryWrapper);
        if (!one.getPhoneOne().equals(shop.getServiceTel())){
            phoneService.removeById(one.getId());