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 667c574fb4583e44f8d110c9b4a50fd572a2c87a
Test See merge request !490
Dev See merge request !489
2. 再购买时，优惠券选择不使用的时候，没有反应的bug修复
2. 再退款的时候，要把积分值带入
