From 193945d70b561bc96bb608b47b9b2e4dba3b45b2 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 07 三月 2025 11:40:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/query/TContractQuery.java | 11 +++++++++--
1 files changed, 9 insertions(+), 2 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..0cb2c3a 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
@@ -15,9 +16,15 @@
@ApiModelProperty(value = "合同编号")
private String contractNumber;
@ApiModelProperty(value = "合同名称")
- private Integer contractName;
- @ApiModelProperty(value = "合同状态 1=待提交 2=待审批 3=未签订 4=已签订")
+ private String contractName;
+ @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;
+ @ApiModelProperty(value = "查询多个状态")
+ private List<Integer> statuses;
+
}
--
Gitblit v1.7.1