Merge branch 'master' of http://git.yoho.cn/ufo/yohoufo-fore

# Conflicts:
#	order/src/main/java/com/yohoufo/order/service/impl/ShoppingServiceImpl.java

@@ -16,10 +16,9 @@ import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
 import java.math.BigDecimal;
 import java.util.Arrays;
+import org.springframework.stereotype.Service;
 
 @Service
 public class ShoppingServiceImpl implements IShoppingService{