From 7ff92e90d2318f5c2597c4ba01e0cbfde983cec0 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期三, 17 六月 2026 10:13:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1
---
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwContract.java | 22 ++++++++++++++++++++++
1 files changed, 22 insertions(+), 0 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwContract.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwContract.java
index de03a54..a3872bb 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwContract.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwContract.java
@@ -204,6 +204,10 @@
@ExcelColumn(name="鐗╀笟璐规�婚噾棰�")
private BigDecimal wyTotalFee;
+ @ApiModelProperty(value = "鍚堝悓鐘舵�侀泦鍚�")
+ @TableField(exist = false)
+ private List<Integer> statusList;
+
@ApiModelProperty(value = "鎴块棿涓婚敭 鏌ヨ浣跨敤")
@TableField(exist = false)
private Integer roomId;
@@ -306,6 +310,24 @@
@TableField(exist = false)
private YwContractBillDTO zlBillDTO;
+ @ApiModelProperty(value = "鎴块棿淇℃伅鎽樿锛圚5锛�")
+ @TableField(exist = false)
+ private String roomInfo;
+ @ApiModelProperty(value = "浠樻鏂瑰紡鏂囨锛圚5锛�")
+ @TableField(exist = false)
+ private String payTypeText;
+
+ @ApiModelProperty(value = "璐﹀崟鐘舵�佹彁绀猴紙H5锛�")
+ @TableField(exist = false)
+ private String billStatusTip;
+
+ @ApiModelProperty(value = "璐﹀崟鐘舵�佹彁绀虹被鍨� ok/warn/danger锛圚5锛�")
+ @TableField(exist = false)
+ private String billStatusType;
+
+ @ApiModelProperty(value = "鍏嶇鏈熸枃妗堬紙H5锛�")
+ @TableField(exist = false)
+ private String freeRentPeriod;
}
--
Gitblit v1.9.3