fix: 解决冲突提交

b70a5514 · 邓超 · e8376731 · a6cba482 · b70a5514 · b70a5514
Commit b70a5514 authored Nov 30, 2021 by 邓超
19 changed files
--- a/src/pages/platformCenter/bsmanager/maintenance/maintenance.jsx
+++ b/src/pages/platformCenter/bsmanager/maintenance/maintenance.jsx
--- a/src/pages/platformCenter/bsmanager/workOrder/AddFlowsModal.jsx
+++ b/src/pages/platformCenter/bsmanager/workOrder/AddFlowsModal.jsx
--- a/src/pages/platformCenter/bsmanager/workOrder/AddModal.jsx
+++ b/src/pages/platformCenter/bsmanager/workOrder/AddModal.jsx
--- a/src/pages/platformCenter/bsmanager/workOrder/ChangeAddFlows.jsx
+++ b/src/pages/platformCenter/bsmanager/workOrder/ChangeAddFlows.jsx
--- a/src/pages/platformCenter/bsmanager/workOrder/changeAdd.jsx
+++ b/src/pages/platformCenter/bsmanager/workOrder/changeAdd.jsx
--- a/src/pages/platformCenter/bsmanager/workOrder/incident.jsx
+++ b/src/pages/platformCenter/bsmanager/workOrder/incident.jsx
--- a/src/pages/platformCenter/bsmanager/workOrder/incident.less
+++ b/src/pages/platformCenter/bsmanager/workOrder/incident.less
--- a/src/pages/platformCenter/bsmanager/workOrder/incidentFlow.jsx
+++ b/src/pages/platformCenter/bsmanager/workOrder/incidentFlow.jsx
--- a/src/pages/platformCenter/messageManage/projectManage/ProjectManage.jsx
+++ b/src/pages/platformCenter/messageManage/projectManage/ProjectManage.jsx
--- a/src/pages/platformCenter/messageManage/templateManage/TemplateManage.jsx
+++ b/src/pages/platformCenter/messageManage/templateManage/TemplateManage.jsx
--- a/src/pages/platformCenter/standingBook/standingBook.less
+++ b/src/pages/platformCenter/standingBook/standingBook.less
--- a/src/pages/platformCenter/videoManager/index.js
+++ b/src/pages/platformCenter/videoManager/index.js
--- a/src/pages/userCenter/siteManageV2/siteManage.less
+++ b/src/pages/userCenter/siteManageV2/siteManage.less
--- a/src/pages/userCenter/userManage/EditOrgModal.jsx
+++ b/src/pages/userCenter/userManage/EditOrgModal.jsx
--- a/src/pages/userCenter/userManage/UserManage.js
+++ b/src/pages/userCenter/userManage/UserManage.js
--- a/src/pages/userCenter/userManage/UserManage.less
+++ b/src/pages/userCenter/userManage/UserManage.less
--- a/src/pages/webConfig/menuconfig/webMenu.jsx
+++ b/src/pages/webConfig/menuconfig/webMenu.jsx
--- a/src/routes/config.js
+++ b/src/routes/config.js
--- a/src/services/userCenter/userManage/api.js
+++ b/src/services/userCenter/userManage/api.js