Merge branch 'master' into develop

mall-server-api/src/main/java/com/gree/mall/manager/controller/common/CommonController.java

@@ -31,7 +31,6 @@ import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
-import java.util.stream.Collectors;
 
 
 @Slf4j