Merge branch 'api' into score_shop

jyy

2021-03-10 df6a117d2923400fef1ed14cd60d14f56f4a6eec

 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