From 14a20df4699cf3d933e2bdbe1ba2aba15ade1059 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期二, 26 十一月 2024 09:20:02 +0800
Subject: [PATCH] 解决冲突
---
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwRoom.java | 8 ++++++--
1 files changed, 6 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..8474876 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")
@@ -112,4 +112,8 @@
@ApiModelProperty(value = "妤煎畤鍚嶇О")
@TableField(exist = false)
private String buildingName;
+ @ApiModelProperty(value = "妤煎眰鍚嶇О")
+ @TableField(exist = false)
+ private String floorName;
+
}
--
Gitblit v1.9.3