From c3ac3682cac1d5dc3f2310418502c1c96ffe5a7e Mon Sep 17 00:00:00 2001
From: yupeng <roc__yu@163.com>
Date: 星期五, 07 二月 2025 11:02:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into xizang-changyun
---
ruoyi-system/src/main/java/com/ruoyi/system/model/TContract.java | 7 +++++--
1 files changed, 5 insertions(+), 2 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 4b73a95..30785d7 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
@@ -127,9 +127,12 @@
private Integer status;
@ApiModelProperty(value = "内存大小多个文件逗号拼接")
@TableField("memory")
- private Integer memory;
+ private String memory;
@ApiModelProperty(value = "附件名称 逗号拼接")
@TableField("contract_file_name")
- private Integer contractFileName;
+ private String contractFileName;
+ @ApiModelProperty(value = "租户确认合同电子签名")
+ @TableField("signature")
+ private String signature;
}
--
Gitblit v1.7.1