From 078ce36a32bc6679f32e42fd18a9cbb454ff7b7d Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期一, 10 二月 2025 11:38:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/model/TBill.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/TBill.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/TBill.java
index a298bb2..68ea69f 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/model/TBill.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/TBill.java
@@ -49,13 +49,13 @@
private BigDecimal payableFeesMoney;
@ApiModelProperty(value = "应缴费日期")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@TableField("payable_fees_time")
private LocalDateTime payableFeesTime;
- @ApiModelProperty(value = "缴费状态 1=未缴费 2=待确认 3=已缴费 4=已逾期")
+ @ApiModelProperty(value = "缴费状态 1=未缴费 2=待确认 3=已缴费 4=已逾期 5= 已失效")
@TableField("pay_fees_status")
- private Integer payFeesStatus;
+ private String payFeesStatus;
@ApiModelProperty(value = "缴费金额")
@TableField("pay_fees_money")
@@ -72,7 +72,7 @@
@ApiModelProperty(value = "账单类型 1=租金 2=押金 3=生活费用")
@TableField("bill_type")
- private Integer billType;
+ private String billType;
@ApiModelProperty(value = "逾期天数")
@TableField("over_days")
--
Gitblit v1.7.1