From 96a7015065775e5c3bc3d6458b86b28ad7bfb46b Mon Sep 17 00:00:00 2001
From: yupeng <roc__yu@163.com>
Date: 星期四, 13 三月 2025 17:53:32 +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 c2c2834..14257ff 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
@@ -146,7 +146,7 @@
* 7 待结算
* 8 已结算
*/
- @ApiModelProperty(value = "合同状态 1=待提交 2=待审批 3=未签订 4=已签订 5=已驳回 6=已终止 7=待结算 8=已结算")
+ @ApiModelProperty(value = "合同状态 1=待提交 2=待审批 3=未签订 4=已签订 5=已驳回 6=已终止 7=待结算 8=已结算 9 = 签订待审核")
@TableField("status")
private String status;
@ApiModelProperty(value = "内存大小多个文件逗号拼接")
@@ -172,6 +172,6 @@
private String houseAddress;
@ApiModelProperty(value = "审批流实例id")
@TableField(exist = false)
- private Long instanceId;
+ private String instanceId;
}
--
Gitblit v1.7.1