Merge branch 'dev' into pay_master

zhaoxiaohao

2020-09-29 0bad58cb6d46ec5c111d3adaee11337c5ccd5d9c

1
2
3
4
5
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
com.kidgrow.ribbon.RibbonAutoConfigure,\
com.kidgrow.ribbon.FeignAutoConfigure,\
com.kidgrow.ribbon.RestTemplateAutoConfigure,\
com.kidgrow.ribbon.filter.LbIsolationFilter