Merge branch 'ysx-魔方活动价判断优先级-20230928' into dev

# Conflicts:
#	service/service_ly.go

service/service_ly.go

@@ -200,6 +200,7 @@ func (ls *LyService) GetActivity(sku model.LySku) model.LySku {
 		StandardBrandId: int(sku.StandardBrand.StandardBrandId),
 		GoodsId:         sku.GoodsId,
 		Canal:           sku.Canal,
+		GoodsName:       sku.GoodsName,
 		ClassId:         sku.ClassID2,
 	}
 	var activityService ActivityService