Merge remote-tracking branch 'origin/master'

沈斌

2017-11-02 43d81456014338d53aefc3ec81a9eafa38bf8a3f

 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;