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

fengxiang

2017-12-22 454e8c85ee7f47ff82fa93d502bde832c8f888f9

 src/main/java/com/moral/mapper/DeviceVersionMapper.java

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

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