Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into wb

jinpengyong

2023-08-24 9655ea9ce8cdd671a766f87a0885b0fdff7b89c9

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