合并代码

puzhibing

2024-12-10 1ccd22706067b95141c83110c142c4a66306dd27

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java

@@ -172,7 +172,9 @@
        orderDetailVO.setLatitude(shop.getLatitude());
        orderDetailVO.setShopId(shop.getId());
        orderDetailVO.setTechnicianName(technician.getName());
        orderDetailVO.setTechnicianSubscribeId(String.valueOf(subscribe.getId()));
        if(null != subscribe){
            orderDetailVO.setTechnicianSubscribeId(String.valueOf(subscribe.getId()));
        }
        return orderDetailVO;
    }