Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
黄成意
/
go_sku_server
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
996804f0
authored
Oct 09, 2023
by
杨树贤
Browse files
Options
_('Browse Files')
Download
Plain Diff
Merge branch 'ysx-魔方活动价判断优先级-20230928' into dev
# Conflicts: # service/service_ly.go
parents
499520f5
fb8b9001
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 additions
and
0 deletions
service/service_ly.go
service/service_ly.go
View file @
996804f0
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment