From 0ab9dfd8f122195e4e9f09bd50c59e0a47450bec Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期三, 19 三月 2025 15:50:03 +0800
Subject: [PATCH] fix: resolve merge conflicts in .gitignore
---
ruoyi-system/src/main/java/com/ruoyi/system/model/TCheckAcceptRecord.java | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/TCheckAcceptRecord.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/TCheckAcceptRecord.java
index ecf9eb2..7dbba85 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/model/TCheckAcceptRecord.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/TCheckAcceptRecord.java
@@ -47,6 +47,10 @@
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@TableField("check_time")
private LocalDateTime checkTime;
+ @ApiModelProperty(value = "应验收日期")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ @TableField("acceptance_time")
+ private LocalDateTime acceptanceTime;
@ApiModelProperty(value = "退租原因")
@TableField("lease_reason")
@@ -84,12 +88,18 @@
@TableField("pictures")
private String pictures;
- @ApiModelProperty(value = "验收结果 1=合格 2=不合格")
+ @ApiModelProperty(value = "验收结果 1=合格 0=不合格")
@TableField("check_result")
- private Integer checkResult;
+ private Boolean checkResult;
@ApiModelProperty(value = "验收结算金额")
@TableField("check_money")
private BigDecimal checkMoney;
+ @ApiModelProperty(value = "验收状态 0待验收 1已验收")
+ @TableField("status")
+ private Boolean status;
+ @ApiModelProperty(value = "验收单号 前端忽略不传")
+ @TableField("code")
+ private String code;
}
--
Gitblit v1.7.1