Merge branch 'oldLogin' into city-zw

config/proxy.ts

src/assets/images/SecurityServiceOverview/right/blueBg.png

src/assets/images/SecurityServiceOverview/right/blueIcon.png

src/assets/images/SecurityServiceOverview/right/orangeBg.png

...ssets/images/SecurityServiceOverview/right/orangeIcon.png

src/assets/images/SecurityServiceOverview/right/redBg.png

src/assets/images/SecurityServiceOverview/right/redIcon.png

src/assets/images/SecurityServiceOverview/right/yellowBg.png

...ssets/images/SecurityServiceOverview/right/yellowIcon.png

src/components/CommonTable/index.less

src/components/CommonTable/index.tsx

src/components/CooglMap

src/components/DescriptionItem/index.tsx

src/components/LabelImgText/index.tsx

src/pages/Common/Event/CgftEvent/index.tsx

src/pages/Common/Event/CollectionEvent/index.tsx

src/pages/Common/Event/CommonList/index.less

src/pages/Common/Event/CommonList/index.tsx

...ges/Common/Event/EventDetail/DirectEventDetail/index.less

...ages/Common/Event/EventDetail/DirectEventDetail/index.tsx