# Conflicts: # src/views/webSiteManagement/industryApplication/applicationCate/index.vue # src/views/webSiteManagement/newsCategory/nebulaDynamics/index.vue