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

kaiyu

2021-05-28 f202fd9cf5ab399e8d34812ab44163af3ac78672

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

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

    /**
     * 创建时间