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

kaiyu

2021-07-15 8a1e35934f5ad3e3febe6168e8eb990a0cd9cadb

 screen-manage/src/main/java/com/moral/api/entity/Sensor.java

@@ -85,9 +85,15 @@
    private String unitKey;

    @TableField(exist = false)
    private Integer maxValue;
    private String showUnit;

    @TableField(exist = false)
    private Integer minValue;
    private String showUnitKey;

    @TableField(exist = false)
    private String alarmLevel;

    @TableField(exist = false)
    private String formula;

}