Merge remote-tracking branch 'origin/master'

沈斌

2017-10-26 a768bf08d33635cff018c6cda0e989245fc0a072

 src/main/java/com/moral/monitor/controller/ScreenApiController.java

@@ -15,8 +15,8 @@
/**

 * Created by a on 2017/7/12.

 */

@Controller

@RequestMapping(value = "screen")

//@Controller

//@RequestMapping(value = "screen")

public class ScreenApiController {



    @Resource