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

jinpengyong

2021-05-27 d666793c93e91026e129f00bae414217690635ae

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

@@ -49,6 +49,21 @@
    private String code;

    /**
     * 上限
     */
    private Double upper;

    /**
     * 下限
     */
    private Double lower;

    /**
     * 默认单位
     */
    private String defaultUnitKey;

    /**
     * 创建时间
     */
    private Date createTime;