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 | 78 ++++++++++++++++++---------------------
1 files changed, 36 insertions(+), 42 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 6dccba2..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
@@ -1,11 +1,16 @@
package com.ruoyi.system.model;
+import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.TableId;
+
+import java.math.BigDecimal;
import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableField;
import java.io.Serializable;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.core.domain.BaseModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -17,95 +22,84 @@
* </p>
*
* @author xiaochen
- * @since 2025-01-17
+ * @since 2025-01-20
*/
@Data
@EqualsAndHashCode(callSuper = false)
@TableName("t_check_accept_record")
@ApiModel(value="TCheckAcceptRecord对象", description="验收记录")
-public class TCheckAcceptRecord implements Serializable {
+public class TCheckAcceptRecord extends BaseModel {
private static final long serialVersionUID = 1L;
- @TableId("id")
+ @TableId(value = "id", type = IdType.ASSIGN_ID)
private String id;
@ApiModelProperty(value = "合同id")
- @TableField("contractId")
+ @TableField("contract_id")
private String contractId;
@ApiModelProperty(value = "房屋id")
- @TableField("houseId")
+ @TableField("house_id")
private String houseId;
@ApiModelProperty(value = "验收时间")
- @TableField("checkTime")
+ @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("leaseReason")
+ @TableField("lease_reason")
private String leaseReason;
@ApiModelProperty(value = "验收人员")
- @TableField("checkPerson")
+ @TableField("check_person")
private String checkPerson;
@ApiModelProperty(value = "陪同人员")
- @TableField("accompanyPerson")
+ @TableField("accompany_person")
private String accompanyPerson;
@ApiModelProperty(value = "整体情况")
- @TableField("overallSituation")
+ @TableField("overall_situation")
private String overallSituation;
@ApiModelProperty(value = "家电家具情况")
- @TableField("furnitureSituation")
+ @TableField("furniture_situation")
private String furnitureSituation;
@ApiModelProperty(value = "设施设备情况")
- @TableField("deviceSituation")
+ @TableField("device_situation")
private String deviceSituation;
@ApiModelProperty(value = "清洁情况")
- @TableField("cleanSituation")
+ @TableField("clean_situation")
private String cleanSituation;
@ApiModelProperty(value = "其他问题")
- @TableField("otherProblem")
+ @TableField("other_problem")
private String otherProblem;
@ApiModelProperty(value = "图片")
@TableField("pictures")
private String pictures;
- @ApiModelProperty(value = "验收结果 1=合格 2=不合格")
- @TableField("checkResult")
- private Integer checkResult;
+ @ApiModelProperty(value = "验收结果 1=合格 0=不合格")
+ @TableField("check_result")
+ private Boolean checkResult;
@ApiModelProperty(value = "验收结算金额")
- @TableField("checkMoney")
- private Double checkMoney;
-
- @ApiModelProperty(value = "创建时间")
- @TableField("createTime")
- private LocalDateTime createTime;
-
- @ApiModelProperty(value = "修改时间")
- @TableField("updateTime")
- private LocalDateTime updateTime;
-
- @ApiModelProperty(value = "创建人")
- @TableField("createBy")
- private String createBy;
-
- @ApiModelProperty(value = "修改人")
- @TableField("updateBy")
- private String updateBy;
-
- @ApiModelProperty(value = "是否删除 0=否 1=是")
- @TableField("isDelete")
- @TableLogic
- private Integer isDelete;
-
+ @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