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

wzy

2021-11-28 c76890a550f386a52a7111e3d87242ab35af5b41

 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