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

jinpengyong

2021-11-02 6cc2a1d726e1019079b6d3fa74599426a359c001

 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;
    }

}