Merge branch 'ty_fix' into alpha

wzy

2021-11-11 a8e49145532aac83a85b05492c118a554f72c466

 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