From 6225c37d2f53adf26daf6b4859af5fb5c6fad088 Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期一, 15 五月 2023 16:45:34 +0800
Subject: [PATCH] broker 卡车公司端

---
 src/main/java/com/stylefeng/guns/modular/system/model/InvoicesVo.java |   35 ++++++++++++++++-------------------
 1 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/src/main/java/com/stylefeng/guns/modular/system/model/InvoicesVo.java b/src/main/java/com/stylefeng/guns/modular/system/model/InvoicesVo.java
index 4218875..c63e178 100644
--- a/src/main/java/com/stylefeng/guns/modular/system/model/InvoicesVo.java
+++ b/src/main/java/com/stylefeng/guns/modular/system/model/InvoicesVo.java
@@ -1,6 +1,8 @@
 package com.stylefeng.guns.modular.system.model;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -9,6 +11,9 @@
 
 @Data
 public class InvoicesVo {
+    @JsonSerialize(
+            using = ToStringSerializer.class
+    )
     private Long id;
     @ApiModelProperty("总金额")
     private Double amount;
@@ -21,6 +26,8 @@
     @ApiModelProperty("卡车公司名称")
     private String companyName;
 
+    private String logo;
+
     @ApiModelProperty("invoice Date")
     private Date invoiceDate;
 
@@ -30,6 +37,9 @@
     @ApiModelProperty("客户公司")
     private String sCompanyName;
 
+    @ApiModelProperty("客户地址")
+    private String userAddress;
+
 
     @ApiModelProperty("发货时间")
     @JsonFormat(pattern = "dd/MM/yyyy")
@@ -38,28 +48,15 @@
     @ApiModelProperty("取货码头")
     private String portName;
 
-    @ApiModelProperty("发货联系人姓名")
-    private String sContactName;
+    @ApiModelProperty("1 live unload  2drop hook")
+    private String type;
 
-    @ApiModelProperty("发货联系人电话")
-    private String sContactPhone;
-
-    @ApiModelProperty("附加服务  逗号拼接")
-    private String chassisService;
-
-    @ApiModelProperty("收货时间")
-    @JsonFormat(pattern = "dd/MM/yyyy")
-    private Date deliveryDate;
-
-    @ApiModelProperty("客户目的地公司")
-    private String eCompanyName;
-
-    @ApiModelProperty("收货联系人姓名")
-    private String eContactName;
-    @ApiModelProperty("收货联系人电话")
-    private String eContactPhone;
+    @ApiModelProperty("送柜地址")
+    private String eAddress;
 
 
+    @ApiModelProperty("还柜码头")
+    private String ePortName;
 
     private List<TGoodsVo> goodsVos;
 

--
Gitblit v1.7.1