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

lizijie

2021-05-25 aecc6316d0a6bcb3119dc062106deb5a57cdd790

 screen-manage/src/main/java/com/moral/api/pojo/vo/sensor/SensorVO.java

@@ -31,4 +31,8 @@

    private String unitKey;

    private Integer maxValue;

    private Integer minValue;

}