更新说明
更新说明
Merge branch 'master' of https://github.com/haogefeifei/odoo_framework_magic

Conflicts:
	README.md