alter bean
Merge remote-tracking branch 'origin/JZ'
Merge remote-tracking branch 'origin/master' into JZ