chore: 合并开发分支代码

app/src/main/java/com/yiring/app/service/broadcast/impl/BroadcastAudioServiceImpl.java

@@ -28,7 +28,10 @@ import java.io.File;
 import java.io.IOException;
 import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
-import java.util.*;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Optional;
 import java.util.stream.Collectors;
 import javax.annotation.Resource;
 import javax.persistence.criteria.Order;

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

@@ -236,7 +236,7 @@ public class PositionMessageServiceImpl implements PositionMessageService {
         // 更新定位标签卡状态信息
         if (!tag.getSilent().equals(locationLog.getSilent())) {
             // 如果运动状态发生变更，记录状态变更时间
-            tag.setSilentStatusUpdateTime(id.getTime());
+            tag.setTime(id.getTime());
         }
         tag.setSilent(locationLog.getSilent());
         tag.setOut(locationLog.getOut());