Merge remote-tracking branch 'origin/master'

fengxiang

2018-07-03 b97887d232f865b6a4bf835861aac8a4ebc55c28

 src/main/java/com/moral/service/impl/DeviceVersionServiceImpl.java

@@ -85,6 +85,10 @@
      public  List<DeviceVersion> queryByOrgId(Integer organizationId){
            return  this.deviceVersionMapper.selectListByOrgId(organizationId);
      }
      @Override
      public  List<DeviceVersion> queryByMpointId(Integer mpointId){
            return  this.deviceVersionMapper.selectListByMpointId(mpointId);
      }

      @Override
      public DeviceVersion queryVersionById(Integer versionId) {