From ccf28d1fed1aa2e5437dbe64b5133ba1cbde6ec7 Mon Sep 17 00:00:00 2001 From: renkang <8417338+k94314517@user.noreply.gitee.com> Date: 星期五, 03 一月 2025 15:30:52 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwContractBill.java | 4 +++- 1 files changed, 3 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..1d28bbf 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; @@ -162,6 +161,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