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

fengxiang

2017-12-22 28fed9206419f31086c4d1f936480bfd1f2cdfc0

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

# Conflicts:
#	src/main/java/com/moral/common/bean/PageBean.java

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

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

}