From 199b0b166e158f4606a71278dd5f532e2b87224c Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 26 十一月 2024 16:28:28 +0800
Subject: [PATCH] 开发更新
---
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwContract.java | 38 ++++++++++++++++++++++++++++++++++++--
1 files changed, 36 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..e7ecb22 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")
@@ -120,6 +120,10 @@
@ExcelColumn(name="閫�绉熷師鍥�")
private String btInfo;
+ @ApiModelProperty(value = "閫�绉熸憳瑕�")
+ @ExcelColumn(name="閫�绉熸憳瑕�")
+ private String btRemark;
+
@ApiModelProperty(value = "閫�绉熸棩鏈�")
@ExcelColumn(name="閫�绉熸棩鏈�")
private Date btDate;
@@ -138,6 +142,18 @@
@ApiModelProperty(value = "绉熻祦鏉℃鎶奸噾锛堝厓锛�", example = "1")
@ExcelColumn(name="绉熻祦鏉℃鎶奸噾锛堝厓锛�")
private BigDecimal zlDeposit;
+ @ApiModelProperty(value = "棣栨湡绉熻祦鏉℃鍗曚环锛堝厓锛�", example = "1")
+ @ExcelColumn(name="棣栨湡绉熻祦鏉℃鍗曚环锛堝厓锛�")
+ private BigDecimal zlFirstPrice;
+ @ApiModelProperty(value = "棣栨湡绉熻祦鏉℃浠锋牸鍗曚綅", example = "1")
+ @ExcelColumn(name="棣栨湡绉熻祦鏉℃浠锋牸鍗曚綅")
+ private Integer zlFirstCircle;
+ @ApiModelProperty(value = "鐗╀笟绉熻祦鏉℃鍗曚环锛堝厓锛�", example = "1")
+ @ExcelColumn(name="鐗╀笟绉熻祦鏉℃鍗曚环锛堝厓锛�")
+ private BigDecimal wyFirstPrice;
+ @ApiModelProperty(value = "鐗╀笟绉熻祦鏉℃浠锋牸鍗曚綅", example = "1")
+ @ExcelColumn(name="鐗╀笟绉熻祦鏉℃浠锋牸鍗曚綅")
+ private Integer wyFirstCircle;
@ApiModelProperty(value = "绉熻祦鏀粯鏂瑰紡 0=涓�娆℃�т粯娆撅紱1=姣忎笁涓湀涓�浠橈紱2=鍏釜鏈堜竴浠橈紱3=涓�骞翠竴浠�", example = "1")
@ExcelColumn(name="绉熻祦鏀粯鏂瑰紡 0=涓�娆℃�т粯娆撅紱1=姣忎笁涓湀涓�浠橈紱2=鍏釜鏈堜竴浠橈紱3=涓�骞翠竴浠�")
@@ -222,8 +238,26 @@
@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 = "鐢熸垚璐﹀崟绫诲瀷 0绉熻祦璐﹀崟 1鐗╀笟璐﹀崟")
+ @TableField(exist = false)
+ private int billType;
+ @ApiModelProperty(value = "绉熻祦绉熻祦鏉℃浠锋牸鍗曚綅锛屾蹇靛悕绉�", example = "1")
+ @TableField(exist = false)
+ private String zlFirstCircleStr;
+ @ApiModelProperty(value = "鐗╀笟绉熻祦鏉℃浠锋牸鍗曚綅锛屾蹇靛悕绉�", example = "1")
+ @TableField(exist = false)
+ private String wyFirstCircleStr;
@ApiModelProperty(value = "閫�绉熸椂鏂板鐨勬敹浠樻璐﹀崟")
@TableField(exist = false)
private List<YwContractBill> addBillList;
+ @ApiModelProperty(value = "褰撳墠鏀寔閫�娆句慨鏀归噾棰濈殑璐﹀崟闆嗗悎")
+ @TableField(exist = false)
+ private List<YwContractBill> canBackRentBills;
}
--
Gitblit v1.9.3