From 6f97a42dccaedb7a8950feac205080e63d8be439 Mon Sep 17 00:00:00 2001
From: yupeng <roc__yu@163.com>
Date: 星期三, 26 二月 2025 14:27:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into xizang-changyun
---
ruoyi-system/src/main/java/com/ruoyi/system/query/TContractQuery.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/query/TContractQuery.java b/ruoyi-system/src/main/java/com/ruoyi/system/query/TContractQuery.java
index 52031d9..3b0238e 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/query/TContractQuery.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/query/TContractQuery.java
@@ -5,6 +5,7 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import javax.validation.constraints.NotBlank;
import java.util.List;
@Data
@@ -16,8 +17,11 @@
private String contractNumber;
@ApiModelProperty(value = "合同名称")
private Integer contractName;
- @ApiModelProperty(value = "合同状态 1=待提交 2=待审批 3=未签订 4=已签订")
+ @ApiModelProperty(value = "合同状态 1=待提交 2=待审批 3=未签订 4=已签订 5=已驳回 6=已终止 7=待结算 8=已结算")
private Integer status;
@ApiModelProperty(value = "选中的行")
private List<String> ids;
+ @NotBlank(message = "租户id不可为空")
+ @ApiModelProperty(value = "租户id")
+ private String tenantId;
}
--
Gitblit v1.7.1