# Conflicts: # src/pages/bsmanager/workOrder/incident/AddModal.jsx # src/pages/database/ManagementDataBase/ManagementDataBase.jsx # src/pages/platformCenter/gis/schemeConfig/SchemeConfig.less