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

cjl

2023-10-16 0eaefd62a7caa039a4f16e27be279eac5e84da5c

 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
    * */