Fix names
删除了一些重复的entity文件,对相应功能做了合并。
删除了一些重复的entity文件,对相应功能做了合并。
Step 1. Fetch and check out the branch for this merge request
git fetch origin git checkout -b zhaoyue-dev3 origin/zhaoyue-dev3
Step 2. Review the changes locally
Step 3. Merge the branch and fix any conflicts that come up
git checkout master git merge --no-ff zhaoyue-dev3
Step 4. Push the result of the merge to GitLab
git push origin master
Note that pushing to GitLab requires write access to this repository.
Tip: You can also checkout merge requests locally by following these guidelines