Merge remote-tracking branch 'origin/master'

fengxiang

2018-07-03 b97887d232f865b6a4bf835861aac8a4ebc55c28

 src/main/java/com/moral/service/DeviceVersionService.java

@@ -15,4 +15,10 @@
    void versionSensorConfig(Integer deviceVersionId, Integer[] sensorIds);

    List<Integer> getSensorIds(int deviceVersionId);

    List<DeviceVersion> queryByOrgId(Integer organizationId);

    List<DeviceVersion> queryByMpointId(Integer mpointId);

    DeviceVersion queryVersionById(Integer versionId);
}