- 
Status changed to merged 
- 
mentioned in commit cc534926dc8b23cb65249319f808e27f3ad50098 
- 
1.自定义模板 导航要显示背景颜色,显示字体颜色 2.自定义模板 拼团,秒杀要显示活动的名称 See merge request !314 
- 
2.自定义模板 拼团,秒杀要显示活动的名称 
Step 1. Update the repo and checkout the branch we are going to merge
git fetch origin git checkout -b test origin/test
Step 2. Merge the branch and push the changes to GitLab
git checkout qa git merge --no-ff test git push origin qa
mentioned in commit cc534926dc8b23cb65249319f808e27f3ad50098
1.自定义模板 导航要显示背景颜色,显示字体颜色 2.自定义模板 拼团,秒杀要显示活动的名称 See merge request !314
2.自定义模板 拼团,秒杀要显示活动的名称