修改了fixflowconfig配置文件
Merge remote-tracking branch 'origin/develop-mapping' into
develop-mapping

Conflicts:
	fixflow-expand/src/com/founder/fix/fixflow/expand/config/fixflowconfig.xml