修改了model
4.18 获取数据
4.19 实现数据收集
4.21 测试
test
4.21 Json
commit merged files to this branch
change gitignore
4.25 解决重叠画线问题
merged zhouqj into yemeng