Merge remote-tracking branch 'origin/wb' into qa

jinpengyong

2023-10-27 f86b4032c5824c4e69821ce9b795e8a7c236c799

 screen-api/src/main/java/com/moral/api/pojo/dto/dataDisplay/SensorComparisonDisplayDTO.java

@@ -2,6 +2,7 @@

import lombok.Data;

import java.util.List;
import java.util.Map;

/**
@@ -16,6 +17,11 @@

    private String sensorCode;

    private Map<String,Double> timeValueMap;
    private String code;

    /*
    * map中存time和value
    * */
    private List<Map<String,Object>> timeValueList;

}