Merge remote-tracking branch 'origin/master'

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

@@ -84,6 +84,7 @@ public class WorkerController {
         if (workOrder != null) {
 
             BeanUtils.copyProperties(workOrder, vo);
+
             //调度员联系电话
             User user = commonService.findUser(workOrder.getCreater());
             if (user != null) {
@@ -94,6 +95,7 @@ public class WorkerController {
             if (workSpot != null) {
                 vo.setXiecheContactName(workSpot.getContactName());
                 vo.setXiecheContactPhone(workSpot.getContactPhone());
+                vo.setSpotAddress(workSpot.getAddress());
             }
             //取ExecuteTime第一条GPS上报时间作为开始运单时间，累计用时
             LocationVO locationVO = commonService.getLocationByDate(workOrder.getTruckId(), workOrder.getExecuteTime());

src/main/java/com/aoyang/tms/controller/vo/WorkOrderVO.java

@@ -35,9 +35,13 @@ public class WorkOrderVO extends WorkOrder implements Serializable {
 
     @ApiModelProperty(value = "卸车点联系人")
     private String xiecheContactName;
+
     @ApiModelProperty(value = "卸车点联系人电话")
     private String xiecheContactPhone;
 
+    @ApiModelProperty(value = "作业点地址")
+    private String spotAddress;
+
     @ApiModelProperty(value = "已读未读状态,0未读，1已读")
     private Integer readFlag = 0;