Merge remote-tracking branch 'origin/master'

艾金辉

2023-07-21 214ebdf7db3f56fce7826abe0f286326246125f6

 ard-work/src/main/java/com/ruoyi/alarm/camera/controller/ArdAlarmCameraController.java

文件名从 ard-work/src/main/java/com/ruoyi/alarm/cameraAlarm/controller/ArdAlarmCameraController.java 修改
@@ -1,9 +1,9 @@
package com.ruoyi.alarm.cameraAlarm.controller;
package com.ruoyi.alarm.camera.controller;

import java.util.List;
import javax.servlet.http.HttpServletResponse;
import com.ruoyi.alarm.cameraAlarm.domain.ArdAlarmCamera;
import com.ruoyi.alarm.cameraAlarm.service.IArdAlarmCameraService;
import com.ruoyi.alarm.camera.domain.ArdAlarmCamera;
import com.ruoyi.alarm.camera.service.IArdAlarmCameraService;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;