Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/java/cn/van/business/mq/MessageConsumerService.java

src/main/java/cn/van/business/controller/jd/OrderController.java

@@ -16,7 +16,7 @@ import javax.annotation.Resource;
  * @description：
  */
 @RestController
-@RequestMapping("order")
+@RequestMapping("/order")
 public class OrderController {
 
     public static String TOKEN = "cc0313";

src/main/java/cn/van/business/mq/MessageProducerService.java

@@ -6,7 +6,6 @@ import org.apache.rocketmq.common.message.Message;
 import org.apache.rocketmq.spring.core.RocketMQTemplate;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 /**