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/vo/allocation/AllocationVo.java | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/pojo/vo/allocation/AllocationVo.java b/screen-api/src/main/java/com/moral/api/pojo/vo/allocation/AllocationVo.java
index 64c73f2..556d88e 100644
--- a/screen-api/src/main/java/com/moral/api/pojo/vo/allocation/AllocationVo.java
+++ b/screen-api/src/main/java/com/moral/api/pojo/vo/allocation/AllocationVo.java
@@ -11,6 +11,7 @@
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
+import org.springframework.util.ObjectUtils;
import java.io.Serializable;
import java.util.Date;
@@ -136,6 +137,9 @@
@ApiModelProperty(value = "������������")
private List<ApproveTableListVo> approveList;
+ @ApiModelProperty(value = "������������������")
+ private Integer keyPoint;
+
@TableField(exist = false)
private String time;
@@ -152,4 +156,8 @@
return allocationVo;
}
+ public Integer getkeyPoint() {
+ return ObjectUtils.isEmpty(keyPoint)?0:keyPoint;
+ }
+
}
--
Gitblit v1.8.0