修改government无法注册服务的问题
Merge remote-tracking branch 'origin/master'

Conflicts:
	modules.enterprise/enterprise-webapp-wicket/src/main/java/com/daren/enterprise/webapp/wicket/page/EnterpriseAddPage.java