Merge remote-tracking branch 'origin/master'

Pu Zhibing

2024-12-17 1d4473f81abe4ef200f23b781756a7da689dc718

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

@@ -101,7 +101,7 @@

    @Override
    public Boolean cheUserByPhone(String phone) {
        R<AppUser> r = appUserClient.getAppUserByPhone(phone);
        R<AppUser> r = appUserClient.getAppUserByPhone1(phone);
        if (R.isError(r)){
            return false;
        }