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

cjl

2023-11-08 5c1d58556e9cd4c7603b5e16dc1640f61623af0b

 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;