完成部分会员卡内容
Merge branch 'master' of https://github.com/daodaoliang/caicai

Conflicts:
	report/report/report/Form1.Designer.cs
	report/report/report/Form1.cs