From 2573f2327a2046ec8545e80e4e56d1ee6c55bfae Mon Sep 17 00:00:00 2001 From: zhangmei <645025773@qq.com> Date: 星期六, 08 二月 2025 13:39:41 +0800 Subject: [PATCH] Merge branch 'xizang-changyun' of https://gitee.com/xiaochen991015/xizang into xizang-changyun --- ruoyi-system/src/main/java/com/ruoyi/system/vo/TContractVO.java | 4 ++++ 1 files changed, 4 insertions(+), 0 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..ce55215 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 @@ -3,6 +3,8 @@ 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.Api; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -28,4 +30,6 @@ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private LocalDateTime changeTime; + @ApiModelProperty(value = "房屋信息") + private THouse house; } -- Gitblit v1.7.1