From 8e41bd549e3bf0dab2f713ad1c967c4e673c0e5a Mon Sep 17 00:00:00 2001
From: chen_xi <276999030@qq.com>
Date: Thu, 17 Nov 2022 09:27:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
screen-api/src/main/java/com/moral/api/controller/UAVController.java | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/controller/UAVController.java b/screen-api/src/main/java/com/moral/api/controller/UAVController.java
index 383f606..29c41ef 100644
--- a/screen-api/src/main/java/com/moral/api/controller/UAVController.java
+++ b/screen-api/src/main/java/com/moral/api/controller/UAVController.java
@@ -54,6 +54,7 @@
if (historySecondUavs==null){
return new ResultMessage(ResponseCodeEnum.SENSOR_IS_NOT_EXIST,"null");
}
+
//������������������������
HistorySecondUavVOs vo = HistorySecondUavVOs.convert(historySecondUavs);
return new ResultMessage(ResponseCodeEnum.SUCCESS.getCode(), ResponseCodeEnum.SUCCESS.getMsg(),vo);
--
Gitblit v1.8.0