From 6992aaf0587c09f7c511c1afd12e1519d91363d3 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Thu, 14 Dec 2023 15:38:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cjl' into qa
---
screen-api/src/main/java/com/moral/api/pojo/query/allocation/AllocationPageCond.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/pojo/query/allocation/AllocationPageCond.java b/screen-api/src/main/java/com/moral/api/pojo/query/allocation/AllocationPageCond.java
index 8cc2b87..0285bdf 100644
--- a/screen-api/src/main/java/com/moral/api/pojo/query/allocation/AllocationPageCond.java
+++ b/screen-api/src/main/java/com/moral/api/pojo/query/allocation/AllocationPageCond.java
@@ -25,13 +25,13 @@
public class AllocationPageCond implements Serializable{
@ApiModelProperty(value = "������������id")
- private Integer unitId;
+ private List<Integer> unitId;
@ApiModelProperty(value = "������������id")
- private Integer polluteType;
+ private List<Integer> polluteType;
@ApiModelProperty(value = "������������")
- private Integer state;
+ private List<Integer> state;
@ApiModelProperty(value = "������������id")
private Integer investigationType;
@@ -46,6 +46,9 @@
@ApiModelProperty(value = "������������")
private String startTime;
+ @ApiModelProperty(value = "������")
+ private String allocationNum;
+
@ApiModelProperty(value = "������������")
private String endTime;
--
Gitblit v1.8.0