From 4e8a1c02b45f72f6377603778e8c8746ed82f374 Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Tue, 06 Jan 2026 10:04:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ard-sample/src/main/java/com/ard/sample/manage/model/dto/DeviceHmsDTO.java | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/ard-sample/src/main/java/com/ard/sample/manage/model/dto/DeviceHmsDTO.java b/ard-sample/src/main/java/com/ard/sample/manage/model/dto/DeviceHmsDTO.java
index 29cbece..801a897 100644
--- a/ard-sample/src/main/java/com/ard/sample/manage/model/dto/DeviceHmsDTO.java
+++ b/ard-sample/src/main/java/com/ard/sample/manage/model/dto/DeviceHmsDTO.java
@@ -1,5 +1,6 @@
package com.ard.sample.manage.model.dto;
+import com.baomidou.mybatisplus.annotation.TableField;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
@@ -40,6 +41,10 @@
private LocalDateTime updateTime;
+ private Integer inTheSky;
+
+ private String deviceType;
+
@Override
public DeviceHmsDTO clone() {
try {
--
Gitblit v1.9.3