From 48bf9371a65ad93faebfc95002f43d49d27faf84 Mon Sep 17 00:00:00 2001
From: renkang <8417338+k94314517@user.noreply.gitee.com>
Date: 星期二, 26 十一月 2024 16:29:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwContract.java | 21 +++++++++++++++++++++
1 files changed, 21 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 7247bdf..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
@@ -142,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=涓�骞翠竴浠�")
@@ -232,7 +244,16 @@
@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;
--
Gitblit v1.9.3