From d0fe6ceb4dbb8531e5e7714c5d05d03ec211d3a2 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 25 十一月 2024 10:04:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwContract.java | 15 +++++++++++++++
1 files changed, 15 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 bc6981a..91f5379 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绉熻祦")
@@ -158,6 +161,18 @@
@ApiModelProperty(value = "鍏徃鍚嶇О")
@TableField(exist = false)
private String companyName;
+ @ApiModelProperty(value = "缁忓姙浜哄鍚�")
+ @TableField(exist = false)
+ private String userName;
+ @ApiModelProperty(value = "椤圭洰鍚�")
+ @TableField(exist = false)
+ private String projectName;
+ @ApiModelProperty(value = "绉熷鍚嶇О")
+ @TableField(exist = false)
+ private String renterName;
+ @ApiModelProperty(value = "鍒涘缓浜哄鍚�")
+ @TableField(exist = false)
+ private String creatorName;
@ApiModelProperty(value = "绉熻祦鎬婚潰绉�", example = "1")
@TableField(exist = false)
private BigDecimal totalArea;
--
Gitblit v1.9.3