Merge remote-tracking branch 'origin/master'

puzhibing

2025-05-26 8c6849d98fc168369d6de2d94d2f42a6d67cd9c5

 ruoyi-service/ruoyi-dataInterchange/src/main/java/com/ruoyi/dataInterchange/controller/UPWarnMsgAdptInfoController.java

@@ -91,15 +91,5 @@
      return R.ok();
   }
   
	
   /**
    * 海康威视报警信息推送
    * @return
    */
   @ResponseBody
   @PostMapping("/alarmNotice")
   public void alarmNotice(@RequestBody SubscriptionEvent event) {
      log.error("收到危海康的事件回调");
      log.error(JSON.toJSONString(event));
   }

}