Merge remote-tracking branch 'origin/v6.5_transport_open_20231115' into…

performance-api/src/main/java/com/clx/performance/param/feign/transport/ThirdOrderChildBrokerParam.java

@@ -23,11 +23,12 @@ public class ThirdOrderChildBrokerParam {
     @NotBlank(message = "订单编码不能为空")
     private String childNo;
 
-//    @ApiModelProperty(value = "订单编码", dataType="String", required = true)
-//    @NotBlank(message = "货单编码不能为空")
-//    private String orderNo;
-//    @ApiModelProperty(value = "车牌号", dataType="String", required = true)
-//    private String truckNo;
+    @ApiModelProperty(value = "订单编码", dataType="String", required = true)
+    @NotBlank(message = "货单编码不能为空")
+    private String orderNo;
+    @ApiModelProperty(value = "车牌号", dataType="String", required = true)
+    @NotBlank(message = "车牌号不能为空")
+    private String truckNo;
 
     @ApiModelProperty(value = "运费单价 单位分", dataType="Integer", required = true)
     @NotNull(message = "运费单价不能为空")
@@ -131,9 +132,9 @@ public class ThirdOrderChildBrokerParam {
     @NotNull(message = "收货净重不能为空")
     private BigDecimal receiveNet;
 
-//    @ApiModelProperty(value = "货物名称", dataType="String", required = true)
-//    @NotBlank(message = "货物名称不能为空")
-//    private String goodsName;
+    @ApiModelProperty(value = "货物名称", dataType="String", required = true)
+    @NotBlank(message = "货物名称不能为空")
+    private String goodsName;
 //    @ApiModelProperty(value = "是否车主本人：1是，0否", dataType="Integer", required = true)
 //    private Integer personalDriverFlag;
 
@@ -141,8 +142,9 @@ public class ThirdOrderChildBrokerParam {
     @NotBlank(message = "垫付类型不能为空")
     private Integer advanceType;
 
-//    @ApiModelProperty(value = "货物价格 单位 分", required = true)
-//    private Integer goodsPrice;
+    @ApiModelProperty(value = "货物价格 单位 分", required = true)
+    @NotBlank(message = "货物价格不能为空")
+    private Integer goodsPrice;
 
     @ApiModelProperty(value = "装车磅单图片", required = true)
     @NotEmpty(message = "装车磅单图片不能为空")