From 37b2fa02d4e9540b67f9ec02740d7720ec38df3a Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 11 Dec 2020 14:08:52 +0800
Subject: [PATCH] fix conflict
---
zq-erp/src/main/resources/templates/views/admin/hive/statistics/daily-list-new.html | 2 +-
zq-erp/src/main/resources/config/lhx/application.properties | 7 +++----
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/zq-erp/src/main/resources/config/lhx/application.properties b/zq-erp/src/main/resources/config/lhx/application.properties
index 95b0bd7..d62378d 100644
--- a/zq-erp/src/main/resources/config/lhx/application.properties
+++ b/zq-erp/src/main/resources/config/lhx/application.properties
@@ -37,11 +37,10 @@
#rabbitMQ配置
-rabbitmq.host=47.111.134.136
+rabbitmq.host=120.27.238.55
rabbitmq.port=5672
-rabbitmq.username=hivequeue
-rabbitmq.password=hivequeueadmin
-useRabbit=false
+rabbitmq.username=ct_rabbit
+rabbitmq.password=123456
server.session.timeout=120
diff --git a/zq-erp/src/main/resources/templates/views/admin/hive/statistics/daily-list-new.html b/zq-erp/src/main/resources/templates/views/admin/hive/statistics/daily-list-new.html
index 3f879e8..cb72dd9 100644
--- a/zq-erp/src/main/resources/templates/views/admin/hive/statistics/daily-list-new.html
+++ b/zq-erp/src/main/resources/templates/views/admin/hive/statistics/daily-list-new.html
@@ -208,7 +208,7 @@
};
- function exportExcelexportExcel(){
+ function exportExcel(){
var param=MForm.toUrlParam("#serchform");
--
Gitblit v1.9.1