Merge remote-tracking branch 'origin/master'

fengxiang

2018-02-06 f4ed03e33cd777996c697894c4075128546c3a74

 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);
}