Merge branch '2.1.0' of http://git.ycjcjy.com/SpaceOfCheng/services into 2.1.0

service/events/giveCard.go

@@ -53,7 +53,7 @@ var giveCard = func(e tinyevent.Event) error {
 	cpServ := card.NewCardServ(ctx)
 	for _, act := range acts {
 		switch act.ActiveType {
-		case ActGiveCoupon:
+		case ActGiveCard:
 			res := make(map[string]interface{})
 			if err := json.Unmarshal([]byte(act.ResourceDesc), &res); err != nil {
 				utils.LogError("解析体验卡赠送规则失败: " + err.Error())