diff --git a/src/main/java/com/yxt/purchase/biz/purchasebillamount/PurchaseBillAmount.java b/src/main/java/com/yxt/purchase/biz/purchasebillamount/PurchaseBillAmount.java index c457ed9..2296381 100644 --- a/src/main/java/com/yxt/purchase/biz/purchasebillamount/PurchaseBillAmount.java +++ b/src/main/java/com/yxt/purchase/biz/purchasebillamount/PurchaseBillAmount.java @@ -63,8 +63,14 @@ public class PurchaseBillAmount extends BaseEntity { private String otherShareTypeKey; // 其他费用分摊方式Key @ApiModelProperty("其他费用分摊方式Value") private String otherShareTypeValue; // 其他费用分摊方式Value - @ApiModelProperty("结算账户") - private String settleAccount; // 结算账户 + @ApiModelProperty("结算账户key") + private String settleAccountKey; + @ApiModelProperty("结算账户value") + private String settleAccountValue; + @ApiModelProperty("币种") + private String currencyKey; + @ApiModelProperty("币种") + private String currencyValue; @ApiModelProperty("预付金额") private BigDecimal prepayment; // 预付金额 @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") @@ -76,7 +82,4 @@ public class PurchaseBillAmount extends BaseEntity { private String bankAccountName; // 收款账户 @ApiModelProperty("收款银行账号") private String bankAccount; // 收款银行账号 - @ApiModelProperty("币种") - private String currency; // 币种 - } diff --git a/src/main/java/com/yxt/purchase/biz/purchasebillamount/PurchaseBillAmountDetailsVo.java b/src/main/java/com/yxt/purchase/biz/purchasebillamount/PurchaseBillAmountDetailsVo.java index ac7039a..3f9c40e 100644 --- a/src/main/java/com/yxt/purchase/biz/purchasebillamount/PurchaseBillAmountDetailsVo.java +++ b/src/main/java/com/yxt/purchase/biz/purchasebillamount/PurchaseBillAmountDetailsVo.java @@ -75,8 +75,14 @@ public class PurchaseBillAmountDetailsVo implements Vo { private String otherShareTypeKey; // 其他费用分摊方式Key @ApiModelProperty("其他费用分摊方式Value") private String otherShareTypeValue; // 其他费用分摊方式Value - @ApiModelProperty("结算账户") - private String settleAccount; // 结算账户 + @ApiModelProperty("结算账户key") + private String settleAccountKey; + @ApiModelProperty("结算账户value") + private String settleAccountValue; + @ApiModelProperty("币种") + private String currencyKey; + @ApiModelProperty("币种") + private String currencyValue; @ApiModelProperty("预付金额") private BigDecimal prepayment; // 预付金额 @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") @@ -89,7 +95,4 @@ public class PurchaseBillAmountDetailsVo implements Vo { private String bankAccountName; // 收款账户 @ApiModelProperty("收款银行账号") private String bankAccount; // 收款银行账号 - @ApiModelProperty("币种") - private String currency; // 币种 - } \ No newline at end of file diff --git a/src/main/java/com/yxt/purchase/biz/purchasebillamount/PurchaseBillAmountDto.java b/src/main/java/com/yxt/purchase/biz/purchasebillamount/PurchaseBillAmountDto.java index dd4935b..df97699 100644 --- a/src/main/java/com/yxt/purchase/biz/purchasebillamount/PurchaseBillAmountDto.java +++ b/src/main/java/com/yxt/purchase/biz/purchasebillamount/PurchaseBillAmountDto.java @@ -75,8 +75,14 @@ public class PurchaseBillAmountDto implements Dto { private String otherShareTypeKey; // 其他费用分摊方式Key @ApiModelProperty("其他费用分摊方式Value") private String otherShareTypeValue; // 其他费用分摊方式Value - @ApiModelProperty("结算账户") - private String settleAccount; // 结算账户 + @ApiModelProperty("结算账户key") + private String settleAccountKey; + @ApiModelProperty("结算账户value") + private String settleAccountValue; + @ApiModelProperty("币种") + private String currencyKey; + @ApiModelProperty("币种") + private String currencyValue; @ApiModelProperty("预付金额") private BigDecimal prepayment; // 预付金额 @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") @@ -89,7 +95,4 @@ public class PurchaseBillAmountDto implements Dto { private String bankAccountName; // 收款账户 @ApiModelProperty("收款银行账号") private String bankAccount; // 收款银行账号 - @ApiModelProperty("币种") - private String currency; // 币种 - } \ No newline at end of file