Merge "修改Profile实体类"