Merge branch 'master' into dev

zhaoxiaohao

2020-12-30 d1f6a557ae1a7886aa6a54bd3923b3483db02a68

1
2
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
com.kidgrow.sentinel.config.SentinelAutoConfigure