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

zc-business/src/main/java/com/zc/business/interfaces/OperationLogAspect.java

@@ -196,7 +196,7 @@ public class OperationLogAspect {
                             dcOperLog.setOperParam(function.getString("params"));
                             String functionId = function.getString("functionId");
                             //functionIds.add(functionId);
-                            String hashMap = String.valueOf(((HashMap<String, Object>) (DEVICEFUNCTIONNAME.get(deviceType))).get(functionId));
+                            String hashMap = Objects.equals(deviceType, "5") ?"发布语音广播":String.valueOf(((HashMap<String, Object>) (DEVICEFUNCTIONNAME.get(deviceType))).get(functionId));
                             dcOperLog.setJsonResult("设备" + dcDevice.getDeviceName() + "在" + date + "调用了" + hashMap + "功能并且调用" + sta + "了");
                             dcOperLogService.addDcOperLog(dcOperLog);
                         }