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

jinpengyong

2021-05-27 d666793c93e91026e129f00bae414217690635ae

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

@@ -61,7 +61,7 @@
    /**
     * 默认单位
     */
    private String defaultUtil;
    private String defaultUnitKey;

    /**
     * 创建时间