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

lizijie

2021-09-16 86c06b0f6f30099b436814ab223121aa8239081a

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

@@ -95,9 +95,5 @@
        return Objects.hash(super.hashCode(), sensorCode, unitKey, upper, lower);
    }

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

}