From f6eada9ffd2fe2b8fdf45e2cc51d4290704ab24a Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Wed, 15 Nov 2023 14:24:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into cjl
---
screen-api/src/main/java/com/moral/api/pojo/query/allocation/AllocationPageCond.java | 6 +++---
1 files changed, 3 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 8d759b2..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;
--
Gitblit v1.8.0