From 0ab9dfd8f122195e4e9f09bd50c59e0a47450bec Mon Sep 17 00:00:00 2001 From: mitao <2763622819@qq.com> Date: 星期三, 19 三月 2025 15:50:03 +0800 Subject: [PATCH] fix: resolve merge conflicts in .gitignore --- ruoyi-system/src/main/java/com/ruoyi/system/query/TContractQuery.java | 5 ++++- 1 files changed, 4 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 3b0238e..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 @@ -16,7 +16,7 @@ @ApiModelProperty(value = "合同编号") private String contractNumber; @ApiModelProperty(value = "合同名称") - private Integer contractName; + private String contractName; @ApiModelProperty(value = "合同状态 1=待提交 2=待审批 3=未签订 4=已签订 5=已驳回 6=已终止 7=待结算 8=已结算") private Integer status; @ApiModelProperty(value = "选中的行") @@ -24,4 +24,7 @@ @NotBlank(message = "租户id不可为空") @ApiModelProperty(value = "租户id") private String tenantId; + @ApiModelProperty(value = "查询多个状态") + private List<Integer> statuses; + } -- Gitblit v1.7.1