解决冲突

src/assets/images/warn.png

src/components/DescriptionItem/index.less

src/components/DescriptionItem/index.tsx

src/pages/GlobalModalServices/index.tsx

...s/ConstructionWaste/components/DisposalSiteInfo/index.css

.../ConstructionWaste/components/DisposalSiteInfo/index.less

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

.../ConstructionWaste/components/DistributionChart/index.css

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

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

...modals/ConstructionWaste/components/LicenseInfo/index.css

...odals/ConstructionWaste/components/LicenseInfo/index.less

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

...dals/ConstructionWaste/components/RecyclingInfo/index.css

...als/ConstructionWaste/components/RecyclingInfo/index.less

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

...ls/ConstructionWaste/components/StatisticsChart/index.css

...s/ConstructionWaste/components/StatisticsChart/index.less

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

...es/GlobalModalServices/modals/ConstructionWaste/index.css