From 28d40a97ffa0acfda8e3766b0edd08e24c8dd21f Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 04 四月 2025 00:55:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ruoyi-system/src/main/java/com/ruoyi/system/vo/MyHouseVO.java | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/vo/MyHouseVO.java b/ruoyi-system/src/main/java/com/ruoyi/system/vo/MyHouseVO.java
index d77dbca..a8a10b9 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/vo/MyHouseVO.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/vo/MyHouseVO.java
@@ -1,5 +1,6 @@
package com.ruoyi.system.vo;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.system.model.TBill;
import io.swagger.annotations.ApiModel;
@@ -13,6 +14,8 @@
@Data
@ApiModel(value = "我的在租VO")
public class MyHouseVO {
+ @ApiModelProperty(value = "合同id")
+ private String id;
@ApiModelProperty(value = "地址")
private String houseAddress;
@ApiModelProperty(value = "月付租金")
@@ -33,6 +36,8 @@
private String propertyRightPerson;
@ApiModelProperty(value = "房东联系方式")
private String phone;
+ @ApiModelProperty(value = "退租状态 1=未退租 2=退租申请中 3=已退租")
+ private String rentalReturnStatus;
@ApiModelProperty(value = "交租记录")
private List<PayListVO> payList;
}
--
Gitblit v1.7.1