merge zjhadoop修改