Merge branch 'test6.9.17' of http://git.yoho.cn/ufo/yohoufo-fore into test6.9.17

@@ -1015,15 +1015,11 @@ public class ProductController {
     
     
     @ApiOperation(name = "ufo.product.sizeImage", desc = "查询尺码图片")
     @ApiOperation(name = "ufo.product.sizeImage", desc = "查询尺码图片")
     @RequestMapping(params = "method=ufo.product.sizeImage")
     @RequestMapping(params = "method=ufo.product.sizeImage")
+    @Cachable(expire = 300)
     public ApiResponse getSizeImage(@RequestParam(value = "product_id") Integer productId,
     public ApiResponse getSizeImage(@RequestParam(value = "product_id") Integer productId,
     		@RequestParam(value = "brand_id") Integer brandId) {
     		@RequestParam(value = "brand_id") Integer brandId) {
-        if (null == productId || null == brandId) {
-            LOG.info("in method=ufo.product.sizeImage product_id and brand_id is Null or empty");
-            return new ApiResponse(400, "product_id and brand_id is Null or empty", null);
-        }
-        LOG.info("in method=ufo.product.sizeImage product_id is {}", productId);
-        
-        SizeImageResp result =productService.getSizeImage(productId, brandId);
+        LOG.info("in method=ufo.product.sizeImage product_id is {}, brandId is {}", productId, brandId);
+        SizeImageResp result = productService.getSizeImage(productId, brandId);
         return new ApiResponse.ApiResponseBuilder().code(200).data(result).message("getSizeImage success").build();
         return new ApiResponse.ApiResponseBuilder().code(200).data(result).message("getSizeImage success").build();
     }
     }
 }
 }