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 127b964d5f20eb0119d765eb920a923906dfd8bb
Test See merge request !661
Dev See merge request !660
Test See merge request !659
广告图片变形，和加载的时候的效果优化 See merge request !658
Test See merge request !657
积分列表要显示系统广告图片 See merge request !656
Test See merge request !655
Dev See merge request !654
2. 测试返回的bug优化
Dev See merge request !653
