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 paymentList = new ArrayList<>(); @@ -46,9 +58,10 @@ public class PaymentApplyVo implements Vo { private List carList = new ArrayList<>(); @ApiModelProperty("车辆金额合计") private String carTotal; - + @JsonProperty("userSid") private String createBySid; private String taskId; + @JsonProperty("procInsId") private String procInstId; }