Merge remote-tracking branch 'origin/master'

liuhaonan

2022-01-12 d452a8fd59cd8b21bbd8371c56bc2df3af8cd7e8

Merge remote-tracking branch 'origin/master'

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

@@ -113,7 +113,7 @@
    /**
     * 获取单个设备信息   getYSYMonitorInfo
     */
    @GetMapping("/getYSYMonitorInfo")
    @PostMapping("/getYSYMonitorInfo")
    public ResponseVO<Object> getYSYMonitorInfo(@RequestBody MonitorParam monitorParam) {
        YSY_MonitorDto getMonitorDto = monitorService.getYSYMonitorInfo(monitorParam.getAccessToken(), monitorParam.getDeviceSerial());