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

fengxiang

2017-12-22 66489dc04eb54b395ee9558de23e3a5767bb37c0

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

New file
@@ -0,0 +1,4 @@
package com.moral.controller;

public class DeviceVersionController {
}