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

fengxiang

2017-12-22 ee0e4c362e299f9be9a3859d0c142f26871cacf6

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/service/impl/DeviceVersionServiceImpl.java

New file
@@ -0,0 +1,13 @@
package com.moral.service.impl;

import com.moral.mapper.DeviceVersionMapper;
import com.moral.service.DeviceVersionService;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;

@Service
public class DeviceVersionServiceImpl implements DeviceVersionService {
      @Resource
      private DeviceVersionMapper deviceVersionMapper;
}