From 17d7043f10d55429db919238fe639bff1b51ec0e Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期五, 07 二月 2025 15:59:37 +0800
Subject: [PATCH] Merge branch '2.0.1' of http://139.186.142.91:10010/r/productDev/funingyunwei into 2.0.1
---
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwRoom.java | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwRoom.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwRoom.java
index 9f18992..caa8f4a 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwRoom.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwRoom.java
@@ -94,8 +94,8 @@
@ExcelColumn(name="璁＄闈㈢Н锛堝钩鏂圭背锛�")
private BigDecimal rentArea;
- @ApiModelProperty(value = "妤煎眰鏁�", example = "1")
- @ExcelColumn(name="妤煎眰鏁�")
+ @ApiModelProperty(value = "妤煎眰缂栫爜锛堝叧鑱攜w_floor)", example = "1")
+ @ExcelColumn(name="妤煎眰缂栫爜")
private Integer floor;
@ApiModelProperty(value = "鎵�灞為」鐩紪鐮侊紙鍏宠仈yw_project)", example = "1")
@@ -106,10 +106,19 @@
@ExcelColumn(name="鎵�灞炴ゼ瀹囩紪鐮侊紙鍏宠仈yw_building)")
private Integer buildingId;
+ @ApiModelProperty(value = "绉熻祦鐘舵�侊細0=寰呯璧侊紱1=宸茬璧� ;2=鏈紑鍚璧�", example = "1")
+ @TableField(exist = false)
+ private Integer leaseStatus;
+
@ApiModelProperty(value = "椤圭洰鍚嶇О")
@TableField(exist = false)
private String projectName;
@ApiModelProperty(value = "妤煎畤鍚嶇О")
@TableField(exist = false)
private String buildingName;
+ @ApiModelProperty(value = "妤煎眰鍚嶇О")
+ @TableField(exist = false)
+ private String floorName;
+
+
}
--
Gitblit v1.9.3