Merge remote-tracking branch 'origin/master'

zhanzhiqin

2022-05-11 01b3916c90a92501df4bf992d3a686178eb240dd

 ximon-admin/src/main/java/com/sandu/ximon/admin/controller/MonitorController.java

@@ -9,13 +9,10 @@
import com.sandu.ximon.admin.param.MonitorParam;
import com.sandu.ximon.admin.security.PermissionConfig;
import com.sandu.ximon.admin.service.MonitorService;
import com.sandu.ximon.dao.bo.MonitorBo;
import com.sandu.ximon.dao.domain.Monitor;
import com.sandu.ximon.dao.enums.MenuEnum;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;

import java.util.List;

/**
 * 摄像头