添加canvas 笔记
Merge branch 'master' of github.com:LuoZijun/note

s