* feature/停复机1:

# Conflicts:
#	config/proxyList.js
#	dist/index.html
#	dist/static/js/100.a09770f8e3705f60fc92.js
#	dist/static/js/100.bac5ba5150667ca637e6.js
#	dist/static/js/101.aa785281d7787f809c0f.js
#	dist/static/js/118.9aac9c7faf98f8d9e23f.js
#	dist/static/js/app.870790cedc11f265240d.js
#	dist/static/js/app.a955176c1d2a2acb1da9.js
#	dist/static/js/app.b05eb38263c2e832a44a.js
#	dist/static/js/manifest.094659dcdca9738443aa.js
#	dist/static/js/manifest.7e10d154e821b8638937.js
#	dist/static/js/manifest.b83ca238b60e77a84e03.js
#	src/api/actCode.js
#	src/api/api.js
#	src/components/common/selectShop.vue
#	src/components/preview-page.vue
#	src/router/actCodeManageRouter/attractFlowLinkRouter.js
#	src/router/actCodeManageRouter/staffActCodeRouter.js
#	src/views/enterprise/salutatory.vue
#	src/views/salesleads/actCodeManage/attractFlowLink/detail.vue
#	src/views/salesleads/actCodeManage/attractFlowLink/index.vue
#	src/views/salesleads/actCodeManage/attractFlowLink/landingPage/detail.vue
#	src/views/salesleads/actCodeManage/attractFlowLink/landingPage/list.vue
#	src/views/salesleads/actCodeManage/attractFlowLink/landingPage/relationDialog.vue
#	src/views/salesleads/actCodeManage/components/select-clerk/index.vue
#	src/views/salesleads/actCodeManage/components/select-clerk/select-clerk.vue
#	src/views/salesleads/actCodeManage/staffActCode/actCodeDetail.vue
#	src/views/salesleads/actCodeManage/staffActCode/actCodeDetailStatistics.vue
#	src/views/salesleads/actCodeManage/staffActCode/actCodeRecord.vue
#	src/views/salesleads/actCodeManage/staffActCode/newAddChart.vue
#	src/views/salesleads/actCodeManage/staffActCode/views/act-code-table.vue
#	src/views/salesleads/actCodeManage/staffActCode/views/batchAddCode.vue
#	src/views/salesleads/actCodeManage/staffActCode/views/group-list.vue
#	src/views/salesleads/actCodeManage/staffActCode/views/setActCode.vue
#	src/views/salesleads/components/act-code-set.vue
#	src/views/salesleads/components/actCodeDetailInfo.vue
#	src/views/salesleads/components/dataDetail.vue
#	src/views/salesleads/components/welcomesItem.vue
#	static/css/public.css