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 2f54fdc7a6004f6a510721255cc1de9a31fb474c
Test See merge request !1067
订单详情显示优化 See merge request !1066
增加配送方式显示 See merge request !1065
Test See merge request !1064
专享礼包 苹果机不显示 See merge request !1063
Test See merge request !1062
默认自提的是显示的bug See merge request !1061
Test See merge request !1060
1。 加入购物车的bug优化 2。 支付成功的代码显示 See merge request !1059
2。 支付成功的代码显示
Test See merge request !1058
Dev See merge request !1057
Test See merge request !1056
Dev See merge request !1055
2. 地址栏的bug
2. 同城配送
