Merge branch 'develop' of https://github.com/PaddlePaddle/Serving into pipeline-update

python/paddle_serving_app/reader/image_reader.py

@@ -677,7 +677,7 @@ class Resize(object):
 
     Args:
         size (sequence or int): Desired output size. If size is a sequence like
-            (h, w), output size will be matched to this. If size is an int,
+            (w, h), output size will be matched to this. If size is an int,
             smaller edge of the image will be matched to this number.
             i.e, if height > width, then image will be rescaled to
             (size * height / width, size)