Merge branch 'master' of ssh://blit.7drlb.com:29418/screen_api_v2

fengxiang

2017-12-22 bd0d111931cf15db84187e4a47e9c1e9e73affa4

 src/main/java/com/moral/controller/ReportController.java

@@ -24,7 +24,7 @@
import com.moral.service.HistoryService;



@RestController

@RequestMapping(value = "report")

@RequestMapping("report")

@CrossOrigin(origins = "*", maxAge = 3600)

public class ReportController {