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

fengxiang

2017-12-22 8ad473d0e87886501a73cc408ebe7efbff25f373

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/mapper/DeviceVersionMapper.java

@@ -4,4 +4,5 @@
import com.moral.entity.DeviceVersion;

public interface DeviceVersionMapper extends BaseMapper<DeviceVersion> {
    DeviceVersion selectByPrimaryKey(Integer id);
}