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
Status changed to merged
mentioned in commit 60a36284641868eaa00366456074718841eda042
Dev See merge request !614
2. 积分购，参团的门店匹配问题的修复
2.线下取价 3.(提现，兑换券，预存，积分充值) 的开关
