Merge remote-tracking branch 'origin/dev' into dev

lizijie

2021-08-31 b888331b6ba56caeeab12a4543fe81bac8854794

 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);
    }