add gradle
mark conflict
remove gradle
position
position
merge trunk
add position detail
modify
update
modify
edit
commit
Merge pull request #33 from xinwei76/master

职位详情-初稿-待优化