Merge remote-tracking branch 'origin/master'

fengxiang

2018-01-26 e125b445697a6b8c2b5cc5c57f31249c5088c1c9

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