Merge remote-tracking branch 'remotes/origin/styleEditBranch'

# Conflicts: # src/pages/bsmanager/workOrder/incident/AddModal.jsx # src/pages/database/ManagementDataBase/ManagementDataBase.jsx # src/pages/platformCenter/gis/schemeConfig/SchemeConfig.less
Status Job ID Name Coverage
  Checkout
manual #196883
civ_manage_128 allowed to fail manual
checkout
 
  Install
manual #196884
civ_manage_128 allowed to fail manual
install
 
  Package
manual #196885
civ_manage_128 manual
package
 
  Push
created #196886
civ_manage_128
push_2021
created #196887
civ_manage_128
push_solution