冲突测试
equipment业务
jsonutil工具类
cxf配置文件更新
仪器测试类
Merge branch 'master' of https://github.com/zhouda-genee/project.git

Conflicts:
	GeneeServiceFrameWork/src/applicationContext-cxf.xml
	GeneeServiceFrameWork/src/com/genee/service/framework/utils/json/JsonUtil.java