From d33ec6038e2128d9ddbf130cf05fc309efc6ca8f Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 25 十一月 2024 18:37:43 +0800
Subject: [PATCH] 开发更新

---
 server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwContract.java |   17 +++++++++++++++--
 1 files changed, 15 insertions(+), 2 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 99b45fa..7247bdf 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
@@ -50,8 +50,8 @@
     @ExcelColumn(name="鏄惁鍒犻櫎0鍚� 1鏄�")
     private Integer isdeleted;
 
-    @ApiModelProperty(value = "澶囨敞")
-    @ExcelColumn(name="澶囨敞")
+    @ApiModelProperty(value = "鍚堝悓鎽樿")
+    @ExcelColumn(name="鍚堝悓鎽樿")
     private String remark;
 
     @ApiModelProperty(value = "鐘舵�� 0寰呮墽琛� 1鎵ц涓� 2宸插埌鏈� 3宸查��绉�", example = "1")
@@ -119,6 +119,10 @@
     @ApiModelProperty(value = "閫�绉熷師鍥�")
     @ExcelColumn(name="閫�绉熷師鍥�")
     private String btInfo;
+
+    @ApiModelProperty(value = "閫�绉熸憳瑕�")
+    @ExcelColumn(name="閫�绉熸憳瑕�")
+    private String btRemark;
 
     @ApiModelProperty(value = "閫�绉熸棩鏈�")
     @ExcelColumn(name="閫�绉熸棩鏈�")
@@ -222,8 +226,17 @@
     @ApiModelProperty(value = "鏌ヨ缁撴潫鏃堕棿")
     @TableField(exist = false)
     private Date queryEndTime;
+    @ApiModelProperty(value = "閫�娆惧叧闂处鍗曟暟")
+    @TableField(exist = false)
+    private int btCLoseBill;
+    @ApiModelProperty(value = "閫�娆炬湭缁撴竻璐﹀崟鏁�")
+    @TableField(exist = false)
+    private int btWaitBill;
 
     @ApiModelProperty(value = "閫�绉熸椂鏂板鐨勬敹浠樻璐﹀崟")
     @TableField(exist = false)
     private List<YwContractBill> addBillList;
+    @ApiModelProperty(value = "褰撳墠鏀寔閫�娆句慨鏀归噾棰濈殑璐﹀崟闆嗗悎")
+    @TableField(exist = false)
+    private List<YwContractBill> canBackRentBills;
 }

--
Gitblit v1.9.3