Merge remote-tracking branch 'origin/wb' into qa

jinpengyong

2023-08-31 e77cdf62567ba92d2d3131da20429dcbfc3b7ea2

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

}