Merge branch 'master' of https://g.civnet.cn:8443/ReactWeb5/maintenance

# Conflicts: # src/pages/userCenter/userManage/UserManage.jsx
Status Job ID Name Coverage
  Checkout
manual #216169
civ_manage_128 allowed to fail manual
checkout
 
  Install
manual #216170
civ_manage_128 allowed to fail manual
install
 
  Package
passed #216171
civ_manage_128 manual
package

08:52

 
  Push
passed #216172
civ_manage_128
push_2021

01:05

passed #216173
civ_manage_128
push_solution

00:09