Merge pull request #44 from JohnCny/master

merge
[mod]营销导出修改
Merge pull request #66 from tanwh/master

[mod]营销导出修改