From 07c1ebfe7589fd68363a9cb72301359f953658d3 Mon Sep 17 00:00:00 2001 From: liukangdong <898885815@qq.com> Date: 星期五, 10 一月 2025 17:57:32 +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 | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 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 0b05aba..9579cc6 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 @@ -105,7 +105,6 @@ @ApiModelProperty(value = "璐圭敤绫诲瀷锛�0=鍛ㄦ湡璐圭敤锛�1=涓�娆℃�ц垂鐢�") @TableField(exist = false) private Integer feeType; - @ApiModelProperty(value = "鎵�灞炲叕鍙�", example = "1") private Integer companyId; @@ -149,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; @@ -162,6 +170,9 @@ @ExcelColumn(name="鍚堝悓缂栧彿",index = 2,width = 10) @TableField(exist = false) private String contractCode; + @ApiModelProperty(value = "鍚堝悓鐘舵��", example = "1") + @TableField(exist = false) + private Integer contractStatus; @ApiModelProperty(value = "妤煎畤鎴块棿", example = "1") @ExcelColumn(name="妤煎畤鎴块棿",index = 1,width = 10) -- Gitblit v1.9.3