From f0837ee21f7650d4413830d4ee90da02bcdd6d36 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Tue, 10 Oct 2023 10:59:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wb' into qa
---
screen-api/src/main/java/com/moral/api/pojo/query/allocation/AllocationPageCond.java | 3 +++
1 files changed, 3 insertions(+), 0 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..8d759b2 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
@@ -46,6 +46,9 @@
@ApiModelProperty(value = "������������")
private String startTime;
+ @ApiModelProperty(value = "������")
+ private String allocationNum;
+
@ApiModelProperty(value = "������������")
private String endTime;
--
Gitblit v1.8.0