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

kaiyu

2021-05-20 e7bc156f901b06e5af54cfe86fe53e7491af7b7f

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

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

    @Override
    protected Serializable pkVal() {
        return this.id;
    }

}