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

Conflicts:
	src/app/helpers/application_helper.rb

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

Conflicts:
	src/app/views/layouts/_admin_header.html.erb

Signed-off-by: xy <xy9123@126.com>