Merge branch '2020.0' of https://github.com/Tencent/spring-cloud-tencent into fix-long-pulling-thread-stop-2020.0
# Conflicts: # CHANGELOG.mdpull/1101/head
commit
a7d32be3bf
# Conflicts: # CHANGELOG.mdpull/1101/head