Merge remote-tracking branch 'origin/master'

sms_water/src/main/java/com/huaxu/controller/MonitorInfoController.java

@@ -191,7 +191,7 @@ public class MonitorInfoController {
 
     @RequestMapping(value="getDeviceParmByDeviceId" , method = RequestMethod.GET)
     @ApiOperation(value = "查询单个设备参数信息(标签设置)")
-    public AjaxMessage<List<DeviceParmEntity>> getByDeviceId(@ApiParam(value = "设备id",required = true) @RequestParam Integer sceneId,@ApiParam(value = "设备id",required = true) @RequestParam Integer id){
+    public AjaxMessage<List<DeviceParmEntity>> getByDeviceId(@ApiParam(value = "场景id",required = true) @RequestParam Integer sceneId,@ApiParam(value = "设备id",required = true) @RequestParam Integer id){
         return new AjaxMessage<>(ResultStatus.OK, deviceParmService.selectByDeviceIdForGis(sceneId,id));
     }
     /**