Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
O
order-group
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
order-group-application
order-group
Commits
c5371b1e
Commit
c5371b1e
authored
Jun 25, 2021
by
周晓航
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'KA-20210622-ID1032306总部和区域活动可同时生效-周晓航' into qa
parents
0c8b163c
29828c54
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
0 deletions
+2
-0
order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
+2
-0
No files found.
order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
View file @
c5371b1e
...
@@ -1343,6 +1343,8 @@ public class OrderServiceImpl implements Orderservice {
...
@@ -1343,6 +1343,8 @@ public class OrderServiceImpl implements Orderservice {
queryOrderResponseVo
.
setNewPayGift
(
new
DemoDataMsg
().
getDemoData
());
queryOrderResponseVo
.
setNewPayGift
(
new
DemoDataMsg
().
getDemoData
());
}
}
}
else
{
queryOrderResponseVo
.
setNewPayGift
(
new
DemoDataMsg
().
getDemoData
());
}
}
}
}
...
...
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