Merge branch 'api' of http://120.27.238.55:7000/r/beauty-erp into api

Helius

2021-03-17 19aea3255126baa2387d4205747cdddff3e8d183

 zq-erp/src/main/resources/config/lhx/application.properties

@@ -41,7 +41,6 @@
rabbitmq.port=5672
rabbitmq.username=ct_rabbit
rabbitmq.password=123456
useRabbit=false

server.session.timeout=120