Merge remote-tracking branch 'origin/master'

src/main/java/com/glxp/api/controller/trace/UdiTraceController.java

@@ -69,9 +69,9 @@ public class UdiTraceController extends BaseController {
     @Resource
     TraceManuCodeRelService traceManuCodeRelService;
     @Resource
-    TraceRecordService traceRecordService;
+    TraceRecordService traceRecordService;    @Resource
-    @Resource
     UdiTraceService udiTraceService;
+
     @Resource
     UserCompanyService userCompanyService;
     @Resource

src/main/java/com/glxp/api/service/trace/RabbitPushService.java

@@ -34,7 +34,7 @@ public class RabbitPushService {
     @Resource
     RabbitQueueService rabbitQueueService;
 
-    public static String FANOUT_EXCHANGE = " trace_fanout_exchange";
+    public static String FANOUT_EXCHANGE = "trace_fanout_exchange";
 
     public void publicPush(MqTraceMessage mqTraceMessage) {
         Channel channel = rabbitTemplate.getConnectionFactory().createConnection().createChannel(true);