Change to use @Autowire
Change to use @Autowire
Merge remote-tracking branch 'origin/master'