Merge branch 'master' into pay_master

zhaoxiaohao

2020-09-21 37781bdea9b06d42eaae0df34591697b290ae20c

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