From 099ea14bba367fd86f0dde37d908f07cc04c3d39 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 10 四月 2025 15:38:01 +0800
Subject: [PATCH] Merge branch 'dev' of http://120.76.84.145:10101/gitblit/r/java/xizang
---
ruoyi-system/src/main/java/com/ruoyi/system/model/TContract.java | 34 +++++++++++++++++++++++++---------
1 files changed, 25 insertions(+), 9 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 14257ff..254c8f9 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
@@ -1,14 +1,9 @@
package com.ruoyi.system.model;
import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.TableId;
-
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
import com.baomidou.mybatisplus.annotation.TableField;
-import java.io.Serializable;
-
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.core.domain.BaseModel;
import io.swagger.annotations.ApiModel;
@@ -16,7 +11,8 @@
import lombok.Data;
import lombok.EqualsAndHashCode;
-import javax.validation.constraints.NotBlank;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
/**
* <p>
@@ -129,7 +125,6 @@
@ApiModelProperty(value = "合同附件,多个逗号拼接")
@TableField("contract_file")
- @NotBlank(message = "合同附件不能为空")
private String contractFile;
@ApiModelProperty(value = "备注")
@@ -149,6 +144,15 @@
@ApiModelProperty(value = "合同状态 1=待提交 2=待审批 3=未签订 4=已签订 5=已驳回 6=已终止 7=待结算 8=已结算 9 = 签订待审核")
@TableField("status")
private String status;
+
+ /**
+ * 签订时间
+ */
+ @ApiModelProperty(value = "签订时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @TableField("sign_time")
+ private LocalDateTime signTime;
+
@ApiModelProperty(value = "内存大小多个文件逗号拼接")
@TableField("memory")
private String memory;
@@ -174,4 +178,16 @@
@TableField(exist = false)
private String instanceId;
+ @ApiModelProperty(value = "房屋使用范围")
+ @TableField("house_use_scope")
+ private String houseUseScope;
+
+ @ApiModelProperty(value = "终止日期-前端传的")
+ @TableField("terminate_time")
+ private LocalDateTime terminateTime;
+
+ @ApiModelProperty(value = "营业部id")
+ @TableField("business_dept_id")
+ private String businessDeptId;
+
}
--
Gitblit v1.7.1