Jenkins自动合并

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsShipDto.java

@@ -20,9 +20,6 @@ public class WmsTmsShipDto extends BaseDto implements Serializable {
     @ApiParam("物料号")
     private String partNo;
 
-    @ApiParam("运输状态")
-    private String orderStatus;
-
     @ApiParam("单据号")
     private String moveNo;
 
@@ -34,4 +31,31 @@ public class WmsTmsShipDto extends BaseDto implements Serializable {
 
     @ApiParam("工厂代码")
     protected String organizeCode;
+
+    @ApiParam("ID")
+    private Long id;
+
+    @ApiParam(value ="道口")
+    private String dockNo;
+
+    @ApiParam(value ="承运商编号")
+    private String vendorNo;
+
+    @ApiParam(value ="承运商名称RDD")
+    private String vendorName;
+
+    @ApiParam(value ="驾驶员编号")
+    private String driverNo;
+
+    @ApiParam(value ="驾驶员名称RDD")
+    private String driverName;
+
+    @ApiParam(value ="驾驶员联系方式RDD")
+    private String phone;
+
+    @ApiParam(value ="单据状态")
+    private Integer orderStatus;
+
+    @ApiParam(value ="车牌号RDD")
+    private String carNo;
 }