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

cjl

2023-09-26 6c2fe039f3a0c9cfd0e84ffe83a0961bb5991d95

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