Merge branch 'feature-haoban-role' of http://git.gicdev.com/haoban3.0/haoban-manage3.0.git into feature-haoban-role
