Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_api_v2.git

xufenglei

2018-01-05 930adc902c0d0a81b685e7d3f0443df50cb608a0

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

@@ -41,7 +41,7 @@
                  if(ids.length==1){
                        deviceVersionMapper.deleteByPrimaryKey(ids[0]);
                  }else{
                        Example example = new Example(DeviceVersion.class);
                        Example example = new Example(ENTITY_CLASS);
                        example.or().andIn("id", Arrays.asList(ids));
                        deviceVersionMapper.deleteByExample(example);
                  }