Commit 996804f0 by 杨树贤

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

# Conflicts:
#	service/service_ly.go
parents 499520f5 fb8b9001
Showing with 1 additions and 0 deletions
...@@ -200,6 +200,7 @@ func (ls *LyService) GetActivity(sku model.LySku) model.LySku { ...@@ -200,6 +200,7 @@ func (ls *LyService) GetActivity(sku model.LySku) model.LySku {
StandardBrandId: int(sku.StandardBrand.StandardBrandId), StandardBrandId: int(sku.StandardBrand.StandardBrandId),
GoodsId: sku.GoodsId, GoodsId: sku.GoodsId,
Canal: sku.Canal, Canal: sku.Canal,
GoodsName: sku.GoodsName,
ClassId: sku.ClassID2, ClassId: sku.ClassID2,
} }
var activityService ActivityService var activityService ActivityService
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment