wxd / MShopWeApp

Step 1. Update the repo and checkout the branch we are going to merge

git fetch origin
git checkout -b dev_20211016 origin/dev_20211016

Step 2. Merge the branch and push the changes to GitLab

git checkout dev
git merge --no-ff dev_20211016
git push origin dev