1
Merge branch 'master' of https://github.com/baoth/ReportDistributeProject

Conflicts:
	weixinreportviews.suo
	weixinreportviews/Model/CS_FirstReport.cs
	weixinreportviews/Model/ProductGeneral.cs
	weixinreportviews/bin/QSmart.Core.dll
	weixinreportviews/weixinreportviews.Publish.xml
Merge branch 'master' of https://github.com/baoth/ReportDistributeProject
修改只能上传一个文件