Merge remote-tracking branch 'origin/master'

luodangjia

2025-01-15 6d44e6f4d503a603fcb1323755f4b0c854d69be0

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

@@ -88,8 +88,10 @@
            String id = technicianSubscribeVO.getId();
            TechnicianSubscribe technicianSubscribe = this.getById(id);
            AppUser appUser = appUserClient.getAppUserById(technicianSubscribe.getAppUserId());
            technicianSubscribeVO.setUserName(appUser.getName());
            technicianSubscribeVO.setPhone(appUser.getPhone());
            if(null != appUser){
                technicianSubscribeVO.setUserName(appUser.getName());
                technicianSubscribeVO.setPhone(appUser.getPhone());
            }
            Integer serviceMode = technicianSubscribeVO.getServiceMode();
            if(1 == serviceMode){
                UserAddress userAddress = JSON.parseObject(technicianSubscribeVO.getUserAddress(), UserAddress.class);