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/TCheckAcceptRecordVO.java | 27 +++++++++++++++++++++++++++
1 files changed, 27 insertions(+), 0 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/vo/TCheckAcceptRecordVO.java b/ruoyi-system/src/main/java/com/ruoyi/system/vo/TCheckAcceptRecordVO.java
new file mode 100644
index 0000000..eb9b904
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/vo/TCheckAcceptRecordVO.java
@@ -0,0 +1,27 @@
+package com.ruoyi.system.vo;
+
+import com.ruoyi.system.model.TCheckAcceptRecord;
+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;
+
+@Data
+@ApiModel(value = "验收记录VO")
+public class TCheckAcceptRecordVO extends TCheckAcceptRecord {
+
+ @ApiModelProperty(value = "合同信息")
+ private TContract contract;
+
+ @ApiModelProperty(value = "房屋信息")
+ private THouse house;
+
+ @ApiModelProperty(value = "房屋名称")
+ private String houseName;
+ @ApiModelProperty(value = "合同编号")
+ private String contractNumber;
+ @ApiModelProperty(value = "房屋地址")
+ private String houseAddress;
+
+}
--
Gitblit v1.7.1