From 3ddfa12fbc43e80e99e4959fbac8881eaa8e3ca3 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Mon, 17 Jan 2022 16:22:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev_
---
screen-api/src/main/java/com/moral/api/pojo/vo/alarm/AlarmLevelVO.java | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/pojo/vo/alarm/AlarmLevelVO.java b/screen-api/src/main/java/com/moral/api/pojo/vo/alarm/AlarmLevelVO.java
index b1e2481..821f0a8 100644
--- a/screen-api/src/main/java/com/moral/api/pojo/vo/alarm/AlarmLevelVO.java
+++ b/screen-api/src/main/java/com/moral/api/pojo/vo/alarm/AlarmLevelVO.java
@@ -1,5 +1,6 @@
package com.moral.api.pojo.vo.alarm;
+import com.fasterxml.jackson.annotation.JsonInclude;
import com.moral.api.entity.Sensor;
import lombok.Data;
@@ -15,6 +16,7 @@
* @Version TODO
**/
@Data
+@JsonInclude(JsonInclude.Include.NON_EMPTY)
public class AlarmLevelVO {
private Map<String,String> alarmLevel;
--
Gitblit v1.8.0