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

fengxiang

2017-12-22 35c9751e86237dd20b8f23ef21f2b9daab97cee1

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,5 +9,4 @@
@RequestMapping("device-version")
@CrossOrigin(origins = "*", maxAge = 3600)
public class DeviceVersionController {

}