fix conflict

Helius

2020-12-11 37b2fa02d4e9540b67f9ec02740d7720ec38df3a

fix conflict

 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


 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");