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/vo/TContractVO.java | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/vo/TContractVO.java b/ruoyi-system/src/main/java/com/ruoyi/system/vo/TContractVO.java
index 2ed5a54..ba62b7b 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/vo/TContractVO.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/vo/TContractVO.java
@@ -1,8 +1,8 @@
package com.ruoyi.system.vo;
-import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.system.model.TContract;
+import com.ruoyi.system.model.THouse;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -28,4 +28,12 @@
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime changeTime;
+ @ApiModelProperty(value = "房屋信息")
+ private THouse house;
+ @ApiModelProperty(value = "当前未缴费账单金额")
+ private BigDecimal payMoney;
+ @ApiModelProperty(value = "房屋验收结果")
+ private Boolean checkResult;
+ @ApiModelProperty(value = "周期 单位年")
+ private Integer cycleTime;
}
--
Gitblit v1.7.1