Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server

mg

2022-10-12 3f9ebf19e687c33287b0eaec64d4564a212f57db

 ycl-platform/src/main/java/com/ycl/controller/platformApi/AlarmController.java

@@ -1,9 +1,9 @@
package com.ycl.controller.platformApi;

import com.ycl.api.CommonResult;
import com.ycl.dto.videoAlarm.AlarmParam;
import com.ycl.dto.video.AlarmParam;
import com.ycl.enums.common.ResultCode;
import com.ycl.service.videoAlarm.IVideoAlarmReportService;
import com.ycl.service.video.IVideoAlarmReportService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;