Sync code

1. Add the soybean-admin git address to your own repository

git remote add otherOrigin https://github.com/soybeanjs/soybean-admin.git

2. Pull the code

git fetch otherOrigin

3. Pick the git commit that needs to be updated through cherry-pick

git cherry-pick [commit id]

4. When there is a conflict in the code, resolve the conflict, then excute the following command, and then execute vim to save

git cherry-pick --continue

vim save operation: esc, :, wq, enter