Merge branch 'master' of http://10.1.235.20:3000/asiainfo/ebc.git

location-rescue-service/src/main/java/com/ai/bss/location/rescue/controller/AlarmManagementController.java

@@ -68,7 +68,7 @@ public class AlarmManagementController {
	/**
	 * 指派救援
	 * 
	 *
	 * @param params
	 * @return
	 * @throws Exception
@@ -97,7 +97,7 @@ public class AlarmManagementController {
	/**
	 * 关闭救援
	 * 
	 *
	 * @param params
	 * @return
	 * @throws Exception
@@ -145,7 +145,7 @@ public class AlarmManagementController {
	/**
	 * 获取报警类型下拉列表
	 * @return
	 * @throws Exception 
	 * @throws Exception
	 */
	@ResponseBody
	@RequestMapping("/queryAlarmTypeList")
@@ -157,7 +157,7 @@ public class AlarmManagementController {
	/**
	 * 删除历史报警
	 * 
	 *
	* @param params
	* @return
	* @throws Exception