Merge branch 'dev_limit_sale0214' into test6.8.6

@@ -545,19 +545,17 @@ public class ProductController {
     
     @ApiOperation(name = "ufo.product.limitInfo", desc = "商品限制出售信息")
     @IgnoreSignature
-    @IgnoreSession
     @RequestMapping(params = "method=ufo.product.limitInfo")
     @Cachable(expire = 180)
     public ApiResponse queryProductLimitInfo(
             @RequestParam(value = "product_id") Integer productId
-			, @RequestParam(value = "user_id") Integer userId) {
+			, @RequestParam(value = "user_id", required = false) Integer userId) {
 		LOG.info("in method=ufo.product.queryProductLimitInfo product_id={}, uerId={}", productId, userId);
 		if (null == productId) {
 			LOG.info("in method=ufo.product.queryProductLimitInfo product_id Is Null");
 			return new ApiResponse(400, "product_id Is Null", null);
 		}
 		JSONObject result = new JSONObject();
-		result.put("", "");
 		String productIdInfo = configReader.getString("ufo.product.productLimitInfo", "");
 		LOG.info("in ufo.product.queryProductLimitInfo queryProductLimitInfo Is {}", productIdInfo);
 		if (StringUtils.contains(productIdInfo, Integer.toString(productId))) {