From 88949c836e6a0e59060f1e79b6fdd179af4774dd Mon Sep 17 00:00:00 2001
From: dimengzhe <251008545@qq.com>
Date: Thu, 6 Oct 2022 20:09:12 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=AB=AF=E8=B4=B9=E7=94=A8?=
 =?UTF-8?q?=E7=94=B3=E8=AF=B7=E4=BF=AE=E6=94=B9=E5=AD=97=E6=AE=B5=E3=80=81?=
 =?UTF-8?q?=E4=BB=98=E6=AC=BE=E7=94=B3=E8=AF=B7=E8=AF=A6=E6=83=85=E4=BB=A5?=
 =?UTF-8?q?=E5=8F=8A=E6=B5=81=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../paymentapply/PaymentApplyDetailsVo.java       |  6 ++++++
 .../paymentapply/PaymentApplyVehicleVo.java       |  4 ++++
 .../api/finance/paymentapply/PaymentApplyVo.java  | 15 ++++++++++++++-
 3 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/paymentapply/PaymentApplyDetailsVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/paymentapply/PaymentApplyDetailsVo.java
index a7009f912e..f0e99ff072 100644
--- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/paymentapply/PaymentApplyDetailsVo.java
+++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/paymentapply/PaymentApplyDetailsVo.java
@@ -1,5 +1,6 @@
 package com.yxt.anrui.terminal.api.finance.paymentapply;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -14,14 +15,19 @@ public class PaymentApplyDetailsVo implements Vo {
     private static final long serialVersionUID = -3182165897761808808L;
 
     @ApiModelProperty("厂家销售通路")
+    @JsonProperty("paymentName")
     private String actualPay;
     @ApiModelProperty("付款方式")
+    @JsonProperty("state")
     private String paymentType;
     @ApiModelProperty("开户行")
+    @JsonProperty("depositBank")
     private String bank;
     @ApiModelProperty("收款银行账号")
+    @JsonProperty("bankAccount")
     private String receivingAccount;
     @ApiModelProperty("付款金额")
+    @JsonProperty("paymentPrice")
     private String payAccount;
     @ApiModelProperty("备注")
     private String remarks;
diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/paymentapply/PaymentApplyVehicleVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/paymentapply/PaymentApplyVehicleVo.java
index db2dd3fd90..76b7aa1e0c 100644
--- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/paymentapply/PaymentApplyVehicleVo.java
+++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/paymentapply/PaymentApplyVehicleVo.java
@@ -1,5 +1,6 @@
 package com.yxt.anrui.terminal.api.finance.paymentapply;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -14,9 +15,12 @@ public class PaymentApplyVehicleVo implements Vo {
     private static final long serialVersionUID = -8919822312166380804L;
 
     @ApiModelProperty("车型")
+    @JsonProperty("model")
     private String modelName;
     @ApiModelProperty("车架号")
+    @JsonProperty("vin")
     private String vinNo;
     @ApiModelProperty("厂家结算价")
+    @JsonProperty("price")
     private String money;
 }
diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/paymentapply/PaymentApplyVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/paymentapply/PaymentApplyVo.java
index fa41461c7d..5b4b5c0d3d 100644
--- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/paymentapply/PaymentApplyVo.java
+++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/paymentapply/PaymentApplyVo.java
@@ -1,5 +1,6 @@
 package com.yxt.anrui.terminal.api.finance.paymentapply;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -17,25 +18,36 @@ public class PaymentApplyVo implements Vo {
     private static final long serialVersionUID = 1191604961683000023L;
 
     @ApiModelProperty("款项名称")
+    @JsonProperty("paymentName")
     private String costTitleValue;
     //创建时间
+    @JsonProperty("申请时间")
     private String createTime;
     //申请人
+    @JsonProperty("申请人")
     private String name;
     //款项类别
+    @JsonProperty("paymentType")
     private String costTypeValue;
     //业务编号
+    @JsonProperty("businessId")
     private String busSid;
     //金额
+    @JsonProperty("price")
     private String cost;
     //付款单位名称
+    @JsonProperty("payerName")
     private String payCompany;
     //收款单位名称
+    @JsonProperty("payeeName")
     private String receiveCompany;
     //付款备注
+    @JsonProperty("paymentRemarks")
     private String remarks;
     //是否涉及车辆
+    @JsonProperty("involveCar")
     private String isVeh;
+    @JsonProperty("involveCarKey")
     private String isVehValue;
     //付款明细List
     private List<PaymentApplyDetailsVo> paymentList = new ArrayList<>();
@@ -46,9 +58,10 @@ public class PaymentApplyVo implements Vo {
     private List<PaymentApplyVehicleVo> carList = new ArrayList<>();
     @ApiModelProperty("车辆金额合计")
     private String carTotal;
-
+    @JsonProperty("userSid")
     private String createBySid;
     private String taskId;
+    @JsonProperty("procInsId")
     private String procInstId;
 
 }