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/AllocationAddCond.java |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/screen-api/src/main/java/com/moral/api/pojo/query/allocation/AllocationAddCond.java b/screen-api/src/main/java/com/moral/api/pojo/query/allocation/AllocationAddCond.java
index 02375d9..f7f27d1 100644
--- a/screen-api/src/main/java/com/moral/api/pojo/query/allocation/AllocationAddCond.java
+++ b/screen-api/src/main/java/com/moral/api/pojo/query/allocation/AllocationAddCond.java
@@ -66,6 +66,10 @@
     private Integer state;
 
 
+    @ApiModelProperty(value = "������������������")
+    private Integer keyPoint;
+
+
     @ApiModelProperty(value = "������������")
     private List<FileVo> fileBaseList;
 

--
Gitblit v1.8.0