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

cjl

2023-08-09 83e42707519f5e2d886618ea55c30e8c3ab381ac

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

@@ -17,6 +17,8 @@

    private String sensorCode;

    private String code;

    /*
    * map中存time和value
    * */