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

fengxiang

2017-12-22 ee0e4c362e299f9be9a3859d0c142f26871cacf6

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

@@ -9,5 +9,4 @@
@RequestMapping("device-version")
@CrossOrigin(origins = "*", maxAge = 3600)
public class DeviceVersionController {

}