Merge branch 'oldLogin' of ssh://171.217.92.33:2224/cityLevel/cd-comprehensive-web into oldLogin

...obalModalServices/modals/AdministPunish/NumTop5/index.tsx

...s/GlobalModalServices/modals/AdministPunishList/index.tsx

...odalServices/modals/AreaSynergy/AreaSynergyList/index.tsx

src/pages/GlobalModalServices/modals/AreaSynergy/index.tsx

...s/ConstructionWaste/components/DisposalSiteInfo/index.tsx

...ConstructionWaste/components/DistributionChart/index.less

.../ConstructionWaste/components/DistributionChart/index.tsx

...modals/ConstructionWaste/components/LicenseInfo/index.tsx

...dals/ConstructionWaste/components/RecyclingInfo/index.tsx

...ls/ConstructionWaste/components/StatisticsChart/index.tsx

...s/GlobalModalServices/modals/ConstructionWaste/index.less

...es/GlobalModalServices/modals/ConstructionWaste/index.tsx

...balModalServices/modals/DyaPatrol/DyaPatrolList/index.tsx

src/pages/GlobalModalServices/modals/DyaPatrol/index.less

src/pages/GlobalModalServices/modals/DyaPatrol/index.tsx

src/pages/GlobalModalServices/modals/LivingGarbage/index.tsx

...als/PipeGalleryDetail/components/AssessmentInfo/index.tsx

...als/PipeGalleryDetail/components/InspectionInfo/index.tsx

...ls/PipeGalleryDetail/components/MaintenanceInfo/index.tsx

...modals/PipeGalleryDetail/components/MonitorInfo/index.tsx