Merge branch 'master' of http://124.70.58.209:3000/ytrd-project-management/GeoHazardMonitor

hazard-admin/src/main/java/com/ozs/web/controller/accountmanagment/MsgAlarmController.java

@@ -177,9 +177,9 @@ public class MsgAlarmController extends BaseController {
         return AjaxResult.success(page);
     }
 
-    @GetMapping(value = "/{alarmId}")
-    @ApiOperation("根据报警信息ID获取详细信息")
-    public AjaxResult getInfo(@PathVariable String alarmId) {
+    @GetMapping(value = "/getByAlarmId/{alarmId}")
+    @ApiOperation("根据报警信息ID获取详细信息-app")
+    public AjaxResult getByAlarmId(@PathVariable String alarmId) {
         MsgAlarm msgAlarm = msgAlarmService.getByAlarmId(alarmId);
         if (!ObjectUtils.isEmpty(msgAlarm)) {
             LambdaQueryWrapper<BaseCameraManagement> lw = new LambdaQueryWrapper<BaseCameraManagement>();