From c885f99c9ff1445f6975d16faf4a23006cd5763b Mon Sep 17 00:00:00 2001
From: yupeng <roc__yu@163.com>
Date: 星期三, 05 二月 2025 14:53:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into xizang-changyun

---
 ruoyi-system/src/main/java/com/ruoyi/system/model/TContract.java |    4 ++--
 1 files changed, 2 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..bc259e8 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,9 @@
     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;
 
 }

--
Gitblit v1.7.1