From 99676ee4afd8aa9ca0caedb07b5754831a746465 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期六, 23 十一月 2024 17:42:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwContractRoom.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwContractRoom.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwContractRoom.java
index 798b054..43ac515 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwContractRoom.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwContractRoom.java
@@ -56,10 +56,14 @@
@ExcelColumn(name="鎴挎簮缂栫爜锛堝叧鑱攜w_room)")
private Integer roomId;
- @ApiModelProperty(value = "鍚堝悓缂栫爜锛堝叧鑱攜w_contract)", example = "1")
- @ExcelColumn(name="鍚堝悓缂栫爜锛堝叧鑱攜w_contract)")
+ @ApiModelProperty(value = "鍚堝悓缂栫爜鎴栬处鍗曠紪鐮侊紙鍏宠仈yw_contract)", example = "1")
+ @ExcelColumn(name="鍚堝悓缂栫爜鎴栬处鍗曠紪鐮侊紙鍏宠仈yw_contract)")
private Integer contractId;
+ @ApiModelProperty(value = "鍏宠仈绫诲瀷锛�0=鍚堝悓锛�1=鍚堝悓璐﹀崟", example = "1")
+ @ExcelColumn(name="鍏宠仈绫诲瀷锛�0=鍚堝悓锛�1=鍚堝悓璐﹀崟")
+ private Integer type;
+
@ApiModelProperty(value = "鎺掑簭鐮�", example = "1")
@ExcelColumn(name="鎺掑簭鐮�")
private Integer sortnum;
--
Gitblit v1.9.3