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

cjl

2023-11-15 f6eada9ffd2fe2b8fdf45e2cc51d4290704ab24a

 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;

}