Merge remote-tracking branch 'origin/master'

fengxiang

2018-07-03 b97887d232f865b6a4bf835861aac8a4ebc55c28

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

@@ -7,4 +7,6 @@

public interface DeviceVersionMapper extends BaseMapper<DeviceVersion> {
    public List<DeviceVersion> selectListByOrgId(Integer orgId);
    // 获取监控点下所有设备型号集合
    public List<DeviceVersion> selectListByMpointId(Integer orgId);
}