添加服务水平协议功能,并在事故单上应用服务水平协议
Merge branch 'master' of github.com:aronezhang/ironmine

Conflicts:
	modules/10_ironmine_irm/app/models/irm/rule_filter.rb
	modules/70_service_slm/config/locales/en.yml
	modules/70_service_slm/config/locales/ja.yml
	modules/70_service_slm/config/locales/zh.yml
	modules/70_service_slm/config/routes.rb
添加服务水平协议功能,并在事故单上应用服务水平协议
Merge branch 'master' of github.com:aronezhang/ironmine
添加服务水平协议功能,并在事故单上应用服务水平协议
Merge branch 'master' of github.com:aronezhang/ironmine