From c684dad4973fba9cc7bd4dc0e39e92675e5df4f5 Mon Sep 17 00:00:00 2001
From: God <10745413@qq.com>
Date: Thu, 11 Jul 2024 14:57:50 +0800
Subject: [PATCH] =?UTF-8?q?oms=E8=B0=83=E7=94=A8=E7=B3=BB=E7=BB=9F?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E4=B8=8B=E6=A0=B9=E6=8D=AE=E7=BB=84=E7=BB=87?=
 =?UTF-8?q?=E5=85=A8=E8=B7=AF=E5=BE=84=E6=9F=A5=E8=AF=A2=E5=BD=93=E5=89=8D?=
 =?UTF-8?q?=E9=83=A8=E9=97=A8=E4=B8=8B=E7=9A=84=E6=89=80=E6=9C=89=E5=91=98?=
 =?UTF-8?q?=E5=B7=A5=E6=8E=A5=E5=8F=A3=E5=BC=80=E5=8F=91=20=E9=87=87?=
 =?UTF-8?q?=E8=B4=AD=E5=8D=95=E4=BF=9D=E5=AD=98=E5=90=8E=E6=8E=A8=E9=80=81?=
 =?UTF-8?q?=E9=A2=84=E6=9C=9F=E5=88=B0=E8=B4=A7=E9=80=9A=E7=9F=A5=E5=8D=95?=
 =?UTF-8?q?=E5=BC=80=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../biz/purchasebillamount/PurchaseBillAmount.java  | 13 ++++++++-----
 .../PurchaseBillAmountDetailsVo.java                | 13 ++++++++-----
 .../purchasebillamount/PurchaseBillAmountDto.java   | 13 ++++++++-----
 3 files changed, 24 insertions(+), 15 deletions(-)

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