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

lizijie

2021-05-28 43e5052b91f0568ccbcf3fd6df70cf8209db184a

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

@@ -84,10 +84,4 @@
    @TableField(exist = false)
    private String unitKey;

    @TableField(exist = false)
    private Integer maxValue;

    @TableField(exist = false)
    private Integer minValue;

}