From 319fdcaa2d7979b056b2801e11d08fe6ecdff126 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Wed, 22 Nov 2023 13:32:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
screen-api/src/main/java/com/moral/api/pojo/vo/allocation/AllocationVo.java | 5 +++++
1 files changed, 5 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 12ae337..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;
@@ -155,4 +156,8 @@
return allocationVo;
}
+ public Integer getkeyPoint() {
+ return ObjectUtils.isEmpty(keyPoint)?0:keyPoint;
+ }
+
}
--
Gitblit v1.8.0