Merge branch 'master' of http://fengxiang@blit.7drlb.com:8888/r/task.git

fengxiang

2017-11-15 b8e86e2b44b796ced6f8fa557dfee532749dcc6c

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

@@ -8,7 +8,6 @@
import org.springframework.stereotype.Controller;

import org.springframework.web.bind.annotation.RequestBody;

import org.springframework.web.bind.annotation.RequestMapping;

import org.springframework.web.bind.annotation.RequestParam;

import org.springframework.web.bind.annotation.ResponseBody;



import javax.annotation.Resource;