From c8aa05fd65cc788abc0f44494338b04993e3b4be Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Fri, 10 Sep 2021 15:08:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev_
---
screen-manage/src/main/java/com/moral/api/service/impl/HistorySecondSpecialServiceImpl.java | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/service/impl/HistorySecondSpecialServiceImpl.java b/screen-manage/src/main/java/com/moral/api/service/impl/HistorySecondSpecialServiceImpl.java
index 47905d9..366e784 100644
--- a/screen-manage/src/main/java/com/moral/api/service/impl/HistorySecondSpecialServiceImpl.java
+++ b/screen-manage/src/main/java/com/moral/api/service/impl/HistorySecondSpecialServiceImpl.java
@@ -75,6 +75,7 @@
historySecondSpecial.setMac(mac);
historySecondSpecial.setTime(time);
historySecondSpecial.setValue(JSONObject.toJSONString(data));
+ historySecondSpecial.setOrganizationId(specialDevice.getOrganizationId());
historySecondSpecial.setBatch(batchTime);
historySecondSpecialMapper.insert(historySecondSpecial);
}
--
Gitblit v1.8.0