Merge remote-tracking branch 'origin/master'

src/main/java/com/aoyang/tms/controller/WorkerController.java

@@ -105,7 +105,9 @@ public class WorkerController {
                 vo.setLatitude(locationVO.getLatitude());
                 vo.setLongitude(locationVO.getLongitude());
             } else {
-                vo.setTime(DateUtils.betweenTime(workOrder.getExecuteTime(), LocalDateTime.now()));
+                if (workOrder.getExecuteTime()!=null) {
+                    vo.setTime(DateUtils.betweenTime(workOrder.getExecuteTime(), LocalDateTime.now()));
+                }
             }
 
             WorkOrderReadinfo workOrderReadinfo = workOrderReadinfoService.findWorkOrderReadinfo(userId, workOrderParam.getId());