Merge remote-tracking branch 'origin/dev' into dev_

jinpengyong

2022-01-17 3ddfa12fbc43e80e99e4959fbac8881eaa8e3ca3

 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;