From c48ecad4633a6624fec92e42ecd9eeca488a636c Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 06 三月 2025 13:42:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-system/src/main/java/com/ruoyi/system/model/TContract.java |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/TContract.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/TContract.java
index 396fe85..7524013 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/model/TContract.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/TContract.java
@@ -16,6 +16,8 @@
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import javax.validation.constraints.NotBlank;
+
 /**
  * <p>
  * 合同管理
@@ -127,6 +129,7 @@
 
     @ApiModelProperty(value = "合同附件,多个逗号拼接")
     @TableField("contract_file")
+    @NotBlank(message = "合同附件不能为空")
     private String contractFile;
 
     @ApiModelProperty(value = "备注")
@@ -164,5 +167,11 @@
     @ApiModelProperty(value = "房屋名称")
     @TableField(exist = false)
     private String houseName;
+    @ApiModelProperty(value = "房屋地址")
+    @TableField(exist = false)
+    private String houseAddress;
+    @ApiModelProperty(value = "审批流实例id")
+    @TableField(exist = false)
+    private String instanceId;
 
 }

--
Gitblit v1.7.1