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

cjl

2023-11-14 3771512ff8b1f4bd6c40cdcdff58b3a64cee78b1

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

}