From 02a6c170797c5d2750ed07b21f22396a7683c54e Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Wed, 25 Oct 2023 15:00:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wb' into qa

---
 screen-api/src/main/java/com/moral/api/service/impl/HistoryFiveMinutelyServiceImpl.java |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/screen-api/src/main/java/com/moral/api/service/impl/HistoryFiveMinutelyServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/HistoryFiveMinutelyServiceImpl.java
index 36cffd6..c290dc5 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/HistoryFiveMinutelyServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/HistoryFiveMinutelyServiceImpl.java
@@ -303,6 +303,7 @@
         queryFiveDataByMacVO.setA05024(result.get("a05024").toString());
         queryFiveDataByMacVO.setA01008(result.get("a01008").toString());
         queryFiveDataByMacVO.setA01007(result.get("a01007").toString());
+        queryFiveDataByMacVO.setA99054(result.get("a99054").toString());
 
         return queryFiveDataByMacVO;
     }

--
Gitblit v1.8.0