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 | 7 +++++++ 1 files changed, 7 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 index 23de55e..eb9b904 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/vo/TCheckAcceptRecordVO.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/vo/TCheckAcceptRecordVO.java @@ -17,4 +17,11 @@ @ApiModelProperty(value = "房屋信息") private THouse house; + @ApiModelProperty(value = "房屋名称") + private String houseName; + @ApiModelProperty(value = "合同编号") + private String contractNumber; + @ApiModelProperty(value = "房屋地址") + private String houseAddress; + } -- Gitblit v1.7.1