From 47305dd209a3ce3889b088a2f2e2f05c923178c5 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期一, 25 十一月 2024 18:38:01 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/funingyunwei
---
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwContract.java | 43 +++++++++++++++++++++++++++++++++++++++++++
1 files changed, 43 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 44f26d6..99b45fa 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
@@ -57,6 +57,9 @@
@ApiModelProperty(value = "鐘舵�� 0寰呮墽琛� 1鎵ц涓� 2宸插埌鏈� 3宸查��绉�", example = "1")
@ExcelColumn(name="鐘舵�� 0寰呮墽琛� 1鎵ц涓� 2宸插埌鏈� 3宸查��绉�")
private Integer status;
+ @ApiModelProperty(value = "璐﹀崟缁撴竻鐘舵�侊細 0寰呬粯娆� 1閮ㄥ垎鏀舵 2宸茬粨娓� 3宸插叧闂�", example = "1")
+ @ExcelColumn(name="璐﹀崟缁撴竻鐘舵�侊細 0寰呬粯娆� 1閮ㄥ垎鏀舵 2宸茬粨娓� 3宸插叧闂�")
+ private Integer billStatus;
@ApiModelProperty(value = "绫诲瀷 0鐗╀笟绉熻祦 1鐗╀笟 2绉熻祦", example = "1")
@ExcelColumn(name="绫诲瀷 0鐗╀笟绉熻祦 1鐗╀笟 2绉熻祦")
@@ -101,7 +104,37 @@
@ApiModelProperty(value = "鑱旂郴浜虹紪鐮侊紙鍏宠仈memebr)", example = "1")
@ExcelColumn(name="鑱旂郴浜虹紪鐮侊紙鍏宠仈memebr)")
private Integer memberId;
+ @ApiModelProperty(value = "閫�绉熺被鍨� 0鍒版湡閫�绉� 1鎹㈡埧閫�绉� 2杩濈害閫�绉� 3鍗忓晢閫�绉�", example = "1")
+ @ExcelColumn(name="閫�绉熺被鍨� 0鍒版湡閫�绉� 1鎹㈡埧閫�绉� 2杩濈害閫�绉� 3鍗忓晢閫�绉�")
+ private Integer btType;
+ @ApiModelProperty(value = "閫�绉熸搷浣滄椂闂�")
+ @ExcelColumn(name="閫�绉熸搷浣滄椂闂�")
+ private Date btActDate;
+
+ @ApiModelProperty(value = "閫�绉熸搷浣滀汉锛堝叧鑱攕ystem_user)", example = "1")
+ @ExcelColumn(name="閫�绉熸搷浣滀汉锛堝叧鑱攕ystem_user)")
+ private Integer btActUserId;
+
+ @ApiModelProperty(value = "閫�绉熷師鍥�")
+ @ExcelColumn(name="閫�绉熷師鍥�")
+ private String btInfo;
+
+ @ApiModelProperty(value = "閫�绉熸棩鏈�")
+ @ExcelColumn(name="閫�绉熸棩鏈�")
+ private Date btDate;
+
+ @ApiModelProperty(value = "閫�绉熺粡鍔炰汉缂栫爜", example = "1")
+ @ExcelColumn(name="閫�绉熺粡鍔炰汉缂栫爜")
+ private Integer btUserId;
+
+ @ApiModelProperty(value = "閫�绉熺鍒版棩鏈�")
+ @ExcelColumn(name="閫�绉熺鍒版棩鏈�")
+ private Date btSignDate;
+
+ @ApiModelProperty(value = "閫�绉熺粨绠楅噾棰濆悎璁�", example = "1")
+ @ExcelColumn(name="閫�绉熺粨绠楅噾棰濆悎璁�")
+ private BigDecimal btFee;
@ApiModelProperty(value = "绉熻祦鏉℃鎶奸噾锛堝厓锛�", example = "1")
@ExcelColumn(name="绉熻祦鏉℃鎶奸噾锛堝厓锛�")
private BigDecimal zlDeposit;
@@ -176,6 +209,12 @@
@ApiModelProperty(value = "鐗╀笟鏉℃闆嗗悎")
@TableField(exist = false)
private List<YwContractDetail> wyDetailList;
+ @ApiModelProperty(value = "鎿嶄綔鏃ュ織闆嗗悎")
+ @TableField(exist = false)
+ private List<YwWorkorderLog> logList;
+ @ApiModelProperty(value = "璐﹀崟闆嗗悎")
+ @TableField(exist = false)
+ private List<YwContractBill> billList;
@ApiModelProperty(value = "閲嶆柊寮�濮嬫椂闂�")
@TableField(exist = false)
private Date queryStartTime;
@@ -183,4 +222,8 @@
@ApiModelProperty(value = "鏌ヨ缁撴潫鏃堕棿")
@TableField(exist = false)
private Date queryEndTime;
+
+ @ApiModelProperty(value = "閫�绉熸椂鏂板鐨勬敹浠樻璐﹀崟")
+ @TableField(exist = false)
+ private List<YwContractBill> addBillList;
}
--
Gitblit v1.9.3