diff options
Diffstat (limited to 'src/org/traccar/model')
-rw-r--r-- | src/org/traccar/model/Device.java | 4 | ||||
-rw-r--r-- | src/org/traccar/model/User.java | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/org/traccar/model/Device.java b/src/org/traccar/model/Device.java index cd5dd12c4..c8a28404c 100644 --- a/src/org/traccar/model/Device.java +++ b/src/org/traccar/model/Device.java @@ -18,7 +18,7 @@ package org.traccar.model; import java.util.Date; import java.util.List; -import org.traccar.database.QueryAdditional; +import org.traccar.database.QueryExtended; import org.traccar.database.QueryIgnore; public class Device extends ExtendedModel { @@ -60,7 +60,7 @@ public class Device extends ExtendedModel { private Date lastUpdate; - @QueryAdditional + @QueryExtended public Date getLastUpdate() { if (lastUpdate != null) { return new Date(lastUpdate.getTime()); diff --git a/src/org/traccar/model/User.java b/src/org/traccar/model/User.java index 72b53ee5d..b71666f87 100644 --- a/src/org/traccar/model/User.java +++ b/src/org/traccar/model/User.java @@ -17,7 +17,7 @@ package org.traccar.model; import com.fasterxml.jackson.annotation.JsonIgnore; -import org.traccar.database.QueryAdditional; +import org.traccar.database.QueryExtended; import org.traccar.database.QueryIgnore; import org.traccar.helper.Hashing; @@ -247,7 +247,7 @@ public class User extends ExtendedModel { private String hashedPassword; @JsonIgnore - @QueryAdditional + @QueryExtended public String getHashedPassword() { return hashedPassword; } @@ -259,7 +259,7 @@ public class User extends ExtendedModel { private String salt; @JsonIgnore - @QueryAdditional + @QueryExtended public String getSalt() { return salt; } |