Merge remote-tracking branch 'origin/master'

Pu Zhibing

2025-02-08 d94776ba25ffcd19cdd7970048ed88d9212bd394

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

@@ -124,8 +124,10 @@
        }
        for (TechnicianSubscribeVO technicianSubscribeVO : technicianSubscribeByUserAndShop1) {
            AppUser appUser = appUserClient.getAppUserById(technicianSubscribeVO.getAppUserId());
            technicianSubscribeVO.setUserName(appUser.getName());
            technicianSubscribeVO.setPhone(appUser.getPhone());
            if(appUser!=null){
                technicianSubscribeVO.setUserName(appUser.getName());
                technicianSubscribeVO.setPhone(appUser.getPhone());
            }
        }
        return pageInfo.setRecords(technicianSubscribeByUserAndShop1);
    }