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/HouseVO.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/vo/HouseVO.java b/ruoyi-system/src/main/java/com/ruoyi/system/vo/HouseVO.java
index 722a6de..a12cadc 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/vo/HouseVO.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/vo/HouseVO.java
@@ -17,6 +17,8 @@
@ApiModelProperty(value = "房屋id")
private String houseId;
+ @ApiModelProperty(value = "房屋id")
+ private String tenantId;
@ApiModelProperty(value = "租户姓名")
private String residentName;
@@ -25,9 +27,11 @@
private String phone;
@ApiModelProperty(value = "属性")
- private String businessAttributes;
+ private String tenantAttributes;
@ApiModelProperty(value = "类型")
private String productType;
+ @ApiModelProperty(value = "类型")
+ private String tenantType;
@ApiModelProperty(value = "入住日期")
@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
private LocalDateTime startTime;
--
Gitblit v1.7.1