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

jinpengyong

2021-05-27 d666793c93e91026e129f00bae414217690635ae

 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;

}