Merge branch 'merge_dev' of https://gitlab.yiring.com/chemical-kesai/kshg-api into dev_tzl

app/src/main/java/com/yiring/app/domain/location/LocationTurnover.java

@@ -2,6 +2,7 @@
 package com.yiring.app.domain.location;
 
 import com.vladmihalcea.hibernate.type.json.JsonBinaryType;
+import com.yiring.auth.domain.user.User;
 import com.yiring.common.domain.BasicEntity;
 import java.io.Serial;
 import java.io.Serializable;
@@ -52,6 +53,10 @@ public class LocationTurnover extends BasicEntity implements Serializable {
     @Comment("定位时间")
     LocalDateTime time;
 
+    @Comment("用户")
+    @ManyToOne(fetch = FetchType.LAZY)
+    User user;
+
     @Comment("进入")
     Boolean enter;
 

app/src/main/java/com/yiring/app/service/message/impl/PositionMessageServiceImpl.java

@@ -218,6 +218,7 @@ public class PositionMessageServiceImpl implements PositionMessageService {
                         .sourceId(fence.getId())
                         .tag(id.getTag())
                         .time(id.getTime())
+                        .user(id.getTag().getUser())
                         .isLatest(true)
                         .build();
                     turnovers.add(turnover);
@@ -267,6 +268,7 @@ public class PositionMessageServiceImpl implements PositionMessageService {
                         .sourceId(district.getId())
                         .tag(id.getTag())
                         .time(id.getTime())
+                        .user(id.getTag().getUser())
                         .isLatest(true)
                         .build();
                     turnovers.add(turnover);