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

jinpengyong

2021-06-23 6f12948893fcc846dfb32aa861c473a842edcd56

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

@@ -7,6 +7,7 @@
import java.time.LocalDateTime;
import java.io.Serializable;
import java.util.Date;
import java.util.Objects;

import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -77,6 +78,22 @@
     */
    private String isDelete;

    @Override
    public boolean equals(Object o) {
        if (this == o) return true;
        if (o == null || getClass() != o.getClass()) return false;
        VersionSensorUnit that = (VersionSensorUnit) o;
        return Objects.equals(sensorCode, that.sensorCode) &&
                Objects.equals(unitKey, that.unitKey) &&
                Objects.equals(upper, that.upper) &&
                Objects.equals(lower, that.lower);
    }

    @Override
    public int hashCode() {

        return Objects.hash(super.hashCode(), sensorCode, unitKey, upper, lower);
    }

    @Override
    protected Serializable pkVal() {