complete_time

src/main/java/com/aoyang/tms/entity/WorkOrder.java

@@ -30,6 +30,7 @@ public class WorkOrder implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+
     @ApiModelProperty(value = "id,自增")
     @TableId(value = "id", type = IdType.AUTO)
     @JsonFormat(shape = JsonFormat.Shape.STRING)
@@ -61,6 +62,19 @@ public class WorkOrder implements Serializable {
     @TableField("org_short_name")
     private String orgShortName;
 
+    @ApiModelProperty(value = "分配卡车id")
+    @TableField("truck_id")
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    private Long truckId;
+
+    @ApiModelProperty(value = "车牌号")
+    @TableField("car_number")
+    private String carNumber;
+
+    @ApiModelProperty(value = "挂车车牌号")
+    @TableField("trailer_number")
+    private String trailerNumber;
+
     @ApiModelProperty(value = "司机1id")
     @TableField("driver_id_one")
     @JsonFormat(shape = JsonFormat.Shape.STRING)
@@ -88,19 +102,6 @@ public class WorkOrder implements Serializable {
     @TableField("escort_name")
     private String escortName;
 
-    @ApiModelProperty(value = "分配卡车id")
-    @TableField("truck_id")
-    @JsonFormat(shape = JsonFormat.Shape.STRING)
-    private Long truckId;
-
-    @ApiModelProperty(value = "车牌号")
-    @TableField("car_number")
-    private String carNumber;
-
-    @ApiModelProperty(value = "挂车车牌号")
-    @TableField("trailer_number")
-    private String trailerNumber;
-
     @ApiModelProperty(value = "托运方id")
     @TableField("shipper_id")
     @JsonFormat(shape = JsonFormat.Shape.STRING)
@@ -123,11 +124,12 @@ public class WorkOrder implements Serializable {
     @TableField("spot_name")
     private String spotName;
 
-    @ApiModelProperty(value = "所属部门id")
+    @ApiModelProperty(value = "运力部门id（tms.truck_dept.id）")
     @TableField("dept_id")
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
     private Long deptId;
 
-    @ApiModelProperty(value = "所属部门名称")
+    @ApiModelProperty(value = "运力部门名称")
     @TableField("dept_name")
     private String deptName;