Merge pull request #5 from HollyDAI/master

Merge pull request #4 from HollyDAI/xr
Merge pull request #7 from HollyDAI/master

6.3
Merge pull request #10 from HollyDAI/master

6.3.1
笔记模块添加分页，笔记的修改成功不再是添加
Merge pull request #14 from HollyDAI/2C

2 c
Merge pull request #15 from HollyDAI/master

6.3.3
二手信息修改信息，查看个人二手信息
二手信息部分finish
Merge pull request #16 from HollyDAI/xr

Xr
Merge branch 'xr' of https://github.com/HollyDAI/newse.git into xr

Conflicts:
	hello.txt
Merge pull request #17 from HollyDAI/xr

Xr
Merge pull request #18 from HollyDAI/master

6.3.4
修改名字
Merge pull request #19 from HollyDAI/xr

Xr
Merge pull request #21 from HollyDAI/master

2C