Signed-off-by: xy <xy9123@126.com>
Merge branch 'master' of https://github.com/xuyao91/rudao

Conflicts:
	src/app/helpers/base_helper.rb
	src/config/routes.rb