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 | 105 ++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 105 insertions(+), 0 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
new file mode 100644
index 0000000..7dbba85
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/TCheckAcceptRecord.java
@@ -0,0 +1,105 @@
+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.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;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 验收记录
+ * </p>
+ *
+ * @author xiaochen
+ * @since 2025-01-20
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("t_check_accept_record")
+@ApiModel(value="TCheckAcceptRecord对象", description="验收记录")
+public class TCheckAcceptRecord extends BaseModel {
+
+ private static final long serialVersionUID = 1L;
+
+ @TableId(value = "id", type = IdType.ASSIGN_ID)
+ private String id;
+
+ @ApiModelProperty(value = "合同id")
+ @TableField("contract_id")
+ private String contractId;
+
+ @ApiModelProperty(value = "房屋id")
+ @TableField("house_id")
+ private String houseId;
+
+ @ApiModelProperty(value = "验收时间")
+ @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")
+ private String leaseReason;
+
+ @ApiModelProperty(value = "验收人员")
+ @TableField("check_person")
+ private String checkPerson;
+
+ @ApiModelProperty(value = "陪同人员")
+ @TableField("accompany_person")
+ private String accompanyPerson;
+
+ @ApiModelProperty(value = "整体情况")
+ @TableField("overall_situation")
+ private String overallSituation;
+
+ @ApiModelProperty(value = "家电家具情况")
+ @TableField("furniture_situation")
+ private String furnitureSituation;
+
+ @ApiModelProperty(value = "设施设备情况")
+ @TableField("device_situation")
+ private String deviceSituation;
+
+ @ApiModelProperty(value = "清洁情况")
+ @TableField("clean_situation")
+ private String cleanSituation;
+
+ @ApiModelProperty(value = "其他问题")
+ @TableField("other_problem")
+ private String otherProblem;
+
+ @ApiModelProperty(value = "图片")
+ @TableField("pictures")
+ private String pictures;
+
+ @ApiModelProperty(value = "验收结果 1=合格 0=不合格")
+ @TableField("check_result")
+ 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