From c301983dbbe7e63e1c3e012b5fec6cc5f0048ca3 Mon Sep 17 00:00:00 2001 From: tianyongbao Date: Mon, 19 Aug 2024 13:49:33 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=A1=E7=94=A8=E5=8D=A1=E8=B4=A6?= =?UTF-8?q?=E5=8D=95=EF=BC=8C=E6=96=B0=E5=A2=9E=E5=88=B7=E5=8D=A1=E6=AC=A1?= =?UTF-8?q?=E6=95=B0=EF=BC=8C=E6=97=A5=E5=B8=B8=E6=94=AF=E5=87=BA=E6=AC=A1?= =?UTF-8?q?=E6=95=B0=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit f1163249969c32f4007114a3153eb818c23db94c) --- .../java/com/ruoyi/invest/domain/CreditCardBill.java | 9 +++++++++ .../com/ruoyi/invest/domain/vo/CreditCardBillVo.java | 6 ------ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/CreditCardBill.java b/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/CreditCardBill.java index e3b85e9..9ff5d12 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/CreditCardBill.java +++ b/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/CreditCardBill.java @@ -55,6 +55,13 @@ public class CreditCardBill extends BaseEntity /** 删除标志(0代表存在 1代表删除) */ private String billState; + + @ApiModelProperty(value="Pos刷卡次数)") + private String posCount; + + @ApiModelProperty(value="日常支出次数)") + private String dailyExpensesCount; + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) @@ -70,6 +77,8 @@ public class CreditCardBill extends BaseEntity .append("updateTime", getUpdateTime()) .append("delFlag", getDelFlag()) .append("billState", getBillState()) + .append("posCount", getPosCount()) + .append("dailyExpensesCount", getDailyExpensesCount()) .toString(); } } diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/vo/CreditCardBillVo.java b/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/vo/CreditCardBillVo.java index 36e7e8c..914c9b6 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/vo/CreditCardBillVo.java +++ b/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/vo/CreditCardBillVo.java @@ -26,11 +26,5 @@ public class CreditCardBillVo extends CreditCardBill @Excel(name = "信用卡") private String bankNameCode; - @ApiModelProperty(value="Pos刷卡次数)") - - private String posCount; - - @ApiModelProperty(value="日常支出次数)") - private String dailyExpensesCount; }