From 2d0b1b3da347f201cfe608e426fb2b7fdb9629a7 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Fri, 17 Aug 2018 17:13:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/moral/controller/ScreenController.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/moral/controller/ScreenController.java b/src/main/java/com/moral/controller/ScreenController.java
index 1c8a370..85ca2b6 100644
--- a/src/main/java/com/moral/controller/ScreenController.java
+++ b/src/main/java/com/moral/controller/ScreenController.java
@@ -665,7 +665,7 @@
return new ResultBean<List<Map<String, Object>>>(list);
}
@GetMapping("getmpoint-byid")
- @ApiOperation(value = "���������������������", notes = "���������������������,������������������������")
+ @ApiOperation(value = "���������������������", notes = "���������������������,���������������������������������������������")
@ApiImplicitParams(value = {
@ApiImplicitParam(name = "monitorPointId",defaultValue = "1",value = "���������id", required = true, paramType = "query", dataType = "Integer"),
})
--
Gitblit v1.8.0