Step 1. Update the repo and checkout the branch we are going to merge
git fetch origin git checkout -b qa origin/qa
Step 2. Merge the branch and push the changes to GitLab
git checkout master git merge --no-ff qa git push origin master
Status changed to merged
mentioned in commit f924e948b1ef9455bea1bf2ddbaa5e99f0778148
Test See merge request !487
1. 自定义模板里面 不同的手机显示的主页轮播图 显示的图片切换按钮 不一样的bug优化 See merge request !486
Test See merge request !485
1 ， 优惠券列表，券的结束时间的显示 See merge request !484
Test See merge request !483
购物车指定单品优惠券的bug优化 See merge request !482
Test See merge request !481
Dev See merge request !480
2. 小程序使用券bug优化
Test See merge request !479
Dev See merge request !478
2. 指定单品优惠券的使用优化
Dev See merge request !477
2. 在兑换优惠券之前要有一个提示框 3. 平摊算法调用接口的优化
