From a09708582ca65d621d14a8c6a3a22222dd7db0d9 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期一, 13 一月 2025 09:27:47 +0800
Subject: [PATCH] Merge branch '2.0.1' of http://139.186.142.91:10010/r/productDev/funingyunwei into 2.0.1
---
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwContractBill.java | 34 ++++++++++++++++++++++++++++++++++
1 files changed, 34 insertions(+), 0 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwContractBill.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwContractBill.java
index 1d28bbf..16238e4 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwContractBill.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwContractBill.java
@@ -148,6 +148,15 @@
@TableField(exist = false)
private String customerName;
+ @ApiModelProperty(value = "瀹㈡埛榛樿鑱旂郴浜�", example = "1")
+ @TableField(exist = false)
+ private Integer customerUserId;
+
+ @ApiModelProperty(value = "瀹㈡埛涓婚敭", example = "1")
+ @TableField(exist = false)
+ private Integer customerId;
+
+
@ApiModelProperty(value = "鍏徃鍚嶇О", example = "1")
@TableField(exist = false)
private String companyName;
@@ -200,6 +209,18 @@
@ExcelColumn(name="鏄惁閫炬湡",index = 9,width = 6,valueMapping = "0=鏈�炬湡锛�1=宸查�炬湡")
private Integer isOverdue;
+ @ApiModelProperty(value = "鍚堝悓鍗曚环锛堝厓锛�", example = "1")
+ @TableField(exist = false)
+ private BigDecimal price;
+
+ @ApiModelProperty(value = "浠樻鍛ㄦ湡绫诲瀷 0=鍏冩瘡骞崇背澶╋紱1=鍏冩瘡骞崇背鏈堬紱2=鍏冩瘡骞崇背骞达紱3=鍏冩瘡澶╋紱4=鍏冩瘡鏈堬紱5=鍏冩瘡骞达紱6=鍏冩瘡鍦猴紱", example = "1")
+ @TableField(exist = false)
+ private Integer circleType;
+
+ @ApiModelProperty(value = "鏉℃绫诲瀷 0绉熻祦鏉℃ 1鐗╀笟鏉℃", example = "1")
+ @TableField(exist = false)
+ private Integer detailType;
+
@ApiModelProperty(value = "闄勪欢淇℃伅", example = "1")
@TableField(exist = false)
private List<Multifile> multifileList;
@@ -212,4 +233,17 @@
@TableField(exist = false)
private List<YwContractRevenue> ywContractRevenueList;
+ @ApiModelProperty(value = "绉熻祦鎬婚潰绉�", example = "1")
+ @TableField(exist = false)
+ private BigDecimal totalArea;
+
+ @ApiModelProperty(value = "绉熻祦鏀粯鏂瑰紡 0=涓�娆℃�т粯娆撅紱1=姣忎笁涓湀涓�浠橈紱2=鍏釜鏈堜竴浠橈紱3=涓�骞翠竴浠�", example = "1")
+ @TableField(exist = false)
+ private Integer zlPayType;
+
+ @ApiModelProperty(value = "鐗╀笟鏀粯鏂瑰紡 0=涓�娆℃�т粯娆撅紱1=姣忎笁涓湀涓�浠橈紱2=鍏釜鏈堜竴浠橈紱3=涓�骞翠竴浠�", example = "1")
+ @TableField(exist = false)
+ private Integer wyPayType;
+
+
}
--
Gitblit v1.9.3