Merge branch 'master' into 0110

@@ -81,7 +81,7 @@ public class AggProductListServiceImpl implements IAggProductListService,Applica
 	@Override
 	public SearchApiResult aggProductList(Map<String, String> paramMap) {
 		try {
-			logger.info("[func=aggProductsByBrandId][param={}][begin={}]", paramMap.toString(), System.currentTimeMillis());
+			logger.info("[func=aggProductList][param={}][begin={}]", paramMap.toString(), System.currentTimeMillis());
 
 			// 1、参数校验
 			String aggType = paramMap.get("aggType");
@@ -172,7 +172,7 @@ public class AggProductListServiceImpl implements IAggProductListService,Applica
 				result.add(searchServiceHelper.getProductMapWithPricePlan(m, productPricePlanMap));
 			}
 		} catch (Exception e) {
-			logger.error("[func=getNewShelveResponseMap][Exception={}][begin={}]", e, System.currentTimeMillis());
+			logger.error("[func=aggProductList][Exception={}][begin={}]", e, System.currentTimeMillis());
 		}
 		return result;
 	}