From ec1c0e3a8c6075965a721fbd68b3b9f41ea168b7 Mon Sep 17 00:00:00 2001
From: luofl <1442745593@qq.com>
Date: 星期一, 07 四月 2025 22:17:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ruoyi-system/src/main/java/com/ruoyi/system/query/TContractQuery.java | 10 ++++++++--
1 files changed, 8 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 b12fbca..bfa74dd 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
@@ -16,12 +16,18 @@
@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;
+
+ @ApiModelProperty(value = "营运部门ID")
+ private String businessDeptId;
+
}
--
Gitblit v1.7.1