Merge branch 'rcs_master_1.0' into rcs_master_all

zhang

2 天以前 14f2c4fce50c871d84f89d2dca2298e0892b4672

 zy-acs-gateway/src/main/java/com/zy/acs/gateway/handler/AgvPackageServerHandler.java

@@ -251,7 +251,7 @@
    }

    public void saveLogToMq(String topic_exchange, String routingKey, DeviceMessage message) {
        if (flag && rabbitTemplate.isRunning()) {
        if (flag) {
            // 写入队列
            rabbitTemplate.convertAndSend(topic_exchange, routingKey, message);
        } else {