* origin/feature/九月迭代:
  add: 新版企微关联弹窗
  fix: 修改底部固定层级
  fix: 客户分组设置到期时间展示逻辑修改
  fix: 组件名称修改
  update: 页面文件名修改

# Conflicts:
#	dist/index.html
#	dist/static/css/app.002edddf6bc8813d780d424c809051b9.css
#	dist/static/css/public.css
#	dist/static/js/11.c8269a6ce3166c2baddb.js
#	dist/static/js/127.981bf46a839013bddfcd.js
#	dist/static/js/19.ddbf9d8719920145627b.js
#	dist/static/js/25.99543d3ea3d0a6d0ba82.js
#	dist/static/js/27.49a63cd5713087b37324.js
#	dist/static/js/27.aeef277e50f51aee1062.js
#	dist/static/js/28.97cc4ec34acceea6b0fc.js
#	dist/static/js/36.ed589290b06b4e2d2cfa.js
#	dist/static/js/40.cfed961aa84d46763ae9.js
#	dist/static/js/46.bfde174f90954e309783.js
#	dist/static/js/49.c98db431ff3a93d1b99c.js
#	dist/static/js/55.841ae24e6ad711dd0724.js
#	dist/static/js/56.f441733d75c7ab766298.js
#	dist/static/js/60.7a3845ea8a229191a208.js
#	dist/static/js/60.e6b9c65ce37c1929ba43.js
#	dist/static/js/61.e4069c16ebc689b0dc37.js
#	dist/static/js/61.ee83351e47e4638289a3.js
#	dist/static/js/62.08c93fc8b5cec569384e.js
#	dist/static/js/62.53aa226e93976be5d4ef.js
#	dist/static/js/63.0cc4b18a26aae449bca8.js
#	dist/static/js/64.8d2437cad744ac931b05.js
#	dist/static/js/64.f45138a59a2a0dfa781f.js
#	dist/static/js/66.ef9b45f25efacaeb2a6e.js
#	dist/static/js/67.2ad7878ba5300bbb2075.js
#	dist/static/js/67.881ede8d681913f3e3aa.js
#	dist/static/js/68.75ce985994b52d0989ac.js
#	dist/static/js/69.f312b8be1f58d823d157.js
#	dist/static/js/70.4f90c0e655cfb7093805.js
#	dist/static/js/70.6788326f4b9204fc6c39.js
#	dist/static/js/72.78bc9a90e43c0f4689d8.js
#	dist/static/js/73.40d5effce4dd1d610bae.js
#	dist/static/js/73.7039961251ed7d629bb7.js
#	dist/static/js/74.c08af2069b1140954569.js
#	dist/static/js/74.d2df8a125f082781388a.js
#	dist/static/js/75.2c7a9137991f6fac666f.js
#	dist/static/js/76.1898057c255763776a04.js
#	dist/static/js/76.6fa5a4895a9b645af850.js
#	dist/static/js/77.3755e506e2e6ccb2f4e0.js
#	dist/static/js/78.e4261d251a8566c89c9e.js
#	dist/static/js/78.f9f633b0110073618c51.js
#	dist/static/js/79.c367f2170b933640c5fb.js
#	dist/static/js/8.1774efeb7b5537a21afa.js
#	dist/static/js/80.2ba1c014b2f05b03d2f4.js
#	dist/static/js/80.b4da3a16a49aa7dec44c.js
#	dist/static/js/81.45b9294a9c41214d9a2d.js
#	dist/static/js/81.ed9f776c33449e4502f5.js
#	dist/static/js/82.f1f0b8be9fe8c0a48f49.js
#	dist/static/js/83.c298352267668f8595b9.js
#	dist/static/js/84.3a3d94cb0710361148ba.js
#	dist/static/js/85.0d7ce1d2a38c10ad5a2e.js
#	dist/static/js/86.20cd7c44d2dce9b99ead.js
#	dist/static/js/86.6e7b650213cd52f6879f.js
#	dist/static/js/86.c0ad564fc61aa87cc435.js
#	dist/static/js/87.02ebe7870a657d76305a.js
#	dist/static/js/87.a39c162a5f1066e1f2f6.js
#	dist/static/js/88.b535eaf6d4dcf1bee6c5.js
#	dist/static/js/89.640cf72f57490ec7bf53.js
#	dist/static/js/89.f57a97e9db4579af197d.js
#	dist/static/js/90.ae2a8e165d9d9a31e58e.js
#	dist/static/js/91.4e3182a759a0deb7737b.js
#	dist/static/js/92.0e522fc1ebf4f123fbbc.js
#	dist/static/js/92.7cf39af9d8e7cfb3cc12.js
#	dist/static/js/93.527fae0b341867534fcb.js
#	dist/static/js/94.b17e42293b65c7831e31.js
#	dist/static/js/95.1cd2779682b88f36cc44.js
#	dist/static/js/95.2e1f80e6d9472d0152e9.js
#	dist/static/js/96.2608b94dc3560dd462cc.js
#	dist/static/js/97.286de4a55de4f21aefa4.js
#	dist/static/js/97.56e642d412b2fc947deb.js
#	dist/static/js/98.bab0433c94b94bd50d57.js
#	dist/static/js/98.f395537903ef38a74302.js
#	dist/static/js/99.56bd214ee9e9f47d1319.js
#	dist/static/js/app.211d255af788bf9d9296.js
#	dist/static/js/manifest.73f3b9dcd0cd62c3e0ba.js
#	dist/static/js/vendor.96dfd34847898b688720.js
#	src/components/common/selectShop.vue
#	src/views/salesleads/actCodeManage/attractFlowLink/detail.vue
#	src/views/salesleads/actCodeManage/staffActCode/actCodeDetail.vue
#	src/views/salesleads/actCodeManage/staffActCode/actCodeDetailStatistics.vue
#	src/views/salesleads/actCodeManage/staffActCode/newAddChart.vue
#	static/css/public.css

* origin/feature/九月迭代:
  fix: 权限树默认展开

* master-copy:

# Conflicts:
#	dist/index.html
#	dist/static/css/index.less
#	dist/static/css/public.css
#	dist/static/js/50.a1015b29c62714ed4720.js
#	dist/static/js/52.6787e341b6db605d59cb.js
#	dist/static/js/53.2054052aba70bb38ed8b.js
#	dist/static/js/55.8e5a59b31576b8166215.js
#	dist/static/js/6.8ce178bff02820b743a4.js
#	dist/static/js/86.ef1bb7b695c60c7f8800.js
#	dist/static/js/app.a955176c1d2a2acb1da9.js
#	dist/static/js/manifest.094659dcdca9738443aa.js
#	src/components/layout/index.vue
#	src/components/single-upload.vue

* 停复机-copy: (102 commits)
  提示 占用 高度计算
  移动横栏位置 不改变框架高度计算
  好办功能即将到期提示
  消息通知组件
  验证展示效果代码删除
  去除调试查看 调用接口
  看效果
  调试
  接口调用注释
  请求不调用
  续费 不调用请求
  dist
  no message
  好办 模拟过期
  update: dist
  update: dist
  update: dist
  update: dist
  update: dist
  update: dist
  ...

# Conflicts:
#	dist/index.html
#	dist/static/css/index.less
#	dist/static/css/public.css
#	dist/static/js/49.807401f5792ada71e97a.js
#	dist/static/js/50.6e0ff0963e754df4d083.js
#	dist/static/js/50.a1015b29c62714ed4720.js
#	dist/static/js/51.3d27cc017de523b3681b.js
#	dist/static/js/52.4e303a459cce381b78f2.js
#	dist/static/js/52.6787e341b6db605d59cb.js
#	dist/static/js/53.2054052aba70bb38ed8b.js
#	dist/static/js/54.bd74a8552e242d23a2a3.js
#	dist/static/js/55.32d0cfad0434efe88df4.js
#	dist/static/js/55.8e5a59b31576b8166215.js
#	dist/static/js/6.8ce178bff02820b743a4.js
#	dist/static/js/60.af2565e8989c037b9353.js
#	dist/static/js/64.8f931ae5c230a8078f56.js
#	dist/static/js/83.dd23d1e732f2559371c1.js
#	dist/static/js/84.9235b0acae13a0283193.js
#	dist/static/js/84.c38cae3e613a1118eead.js
#	dist/static/js/85.074b79f8ca7fec6cf035.js
#	dist/static/js/86.ef1bb7b695c60c7f8800.js
#	dist/static/js/94.9dd6925c4492cc34c03f.js
#	dist/static/js/96.0358ce4b94a445e60b6b.js
#	dist/static/js/97.b09d8bd34179f669239d.js
#	dist/static/js/app.a955176c1d2a2acb1da9.js
#	dist/static/js/manifest.094659dcdca9738443aa.js
#	index.html
#	package.json
#	src/api/actCode.js
#	src/api/api.js
#	src/assets/QRcode.png
#	src/assets/font/demo_index.html
#	src/assets/font/iconfont.css
#	src/assets/font/iconfont.js
#	src/assets/font/iconfont.json
#	src/assets/font/iconfont.ttf
#	src/assets/font/iconfont.woff
#	src/assets/font/iconfont.woff2
#	src/assets/iphone-head.png
#	src/components/common/links.vue
#	src/components/common/selectShop.vue
#	src/components/layout/index.vue
#	src/components/preview-page.vue
#	src/components/single-upload.vue
#	src/components/utils/directives.js
#	src/router/actCodeManageRouter/attractFlowLinkRouter.js
#	src/router/actCodeManageRouter/staffActCodeRouter.js
#	src/router/index.js
#	src/views/enterprise/salutatory.vue
#	src/views/enterprise/salutatoryIndex.vue
#	src/views/enterprise/salutatorySet.vue
#	src/views/salesleads/actCodeManage/attractFlowLink/detail.vue
#	src/views/salesleads/actCodeManage/attractFlowLink/index.vue
#	src/views/salesleads/actCodeManage/attractFlowLink/landingPage/cardView.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/components/select-clerk/selected-clerk-item.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/index.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/actCodeDetailInfo.vue
#	src/views/salesleads/components/dataDetail.vue
#	src/views/salesleads/components/welcomesItem.vue
#	static/css/public.css

This reverts commit 45bc803f.

This reverts commit cbcfcb56.

This reverts commit a8c86231.

This reverts commit cbcfcb56.

* master: (255 commits)
  update: dist
  fix: 欢迎语文案修改
  update: dist
  update: 升级simple-transfer
  update: 调整vue-template-compiler版本号
  update: dist
  update: 文案
  Revert "update: dist"
  Revert "update: dist"
  update: dist
  update: dist
  update: dist
  update: dist
  update: dist
  update: dist
  update: 预览标题样式
  update: 活码图表单天时
  update: 下载文件名称
  update: dist
  update: dist
  ...

# Conflicts:
#	dist/index.html
#	dist/static/css/index.less
#	dist/static/css/public.css
#	dist/static/js/49.807401f5792ada71e97a.js
#	dist/static/js/50.6e0ff0963e754df4d083.js
#	dist/static/js/50.a1015b29c62714ed4720.js
#	dist/static/js/51.3d27cc017de523b3681b.js
#	dist/static/js/52.4e303a459cce381b78f2.js
#	dist/static/js/52.6787e341b6db605d59cb.js
#	dist/static/js/53.2054052aba70bb38ed8b.js
#	dist/static/js/54.bd74a8552e242d23a2a3.js
#	dist/static/js/55.32d0cfad0434efe88df4.js
#	dist/static/js/55.8e5a59b31576b8166215.js
#	dist/static/js/6.8ce178bff02820b743a4.js
#	dist/static/js/60.af2565e8989c037b9353.js
#	dist/static/js/64.8f931ae5c230a8078f56.js
#	dist/static/js/83.dd23d1e732f2559371c1.js
#	dist/static/js/84.9235b0acae13a0283193.js
#	dist/static/js/84.c38cae3e613a1118eead.js
#	dist/static/js/85.074b79f8ca7fec6cf035.js
#	dist/static/js/86.ef1bb7b695c60c7f8800.js
#	dist/static/js/94.9dd6925c4492cc34c03f.js
#	dist/static/js/96.0358ce4b94a445e60b6b.js
#	dist/static/js/97.b09d8bd34179f669239d.js
#	dist/static/js/app.a955176c1d2a2acb1da9.js
#	dist/static/js/manifest.094659dcdca9738443aa.js
#	index.html
#	package.json
#	src/api/actCode.js
#	src/api/api.js
#	src/assets/QRcode.png
#	src/assets/font/demo_index.html
#	src/assets/font/iconfont.css
#	src/assets/font/iconfont.js
#	src/assets/font/iconfont.json
#	src/assets/font/iconfont.ttf
#	src/assets/font/iconfont.woff
#	src/assets/font/iconfont.woff2
#	src/assets/iphone-head.png
#	src/components/common/links.vue
#	src/components/common/selectShop.vue
#	src/components/layout/index.vue
#	src/components/preview-page.vue
#	src/components/single-upload.vue
#	src/components/utils/directives.js
#	src/router/actCodeManageRouter/attractFlowLinkRouter.js
#	src/router/actCodeManageRouter/staffActCodeRouter.js
#	src/router/index.js
#	src/views/enterprise/salutatory.vue
#	src/views/enterprise/salutatoryIndex.vue
#	src/views/enterprise/salutatorySet.vue
#	src/views/salesleads/actCodeManage/attractFlowLink/detail.vue
#	src/views/salesleads/actCodeManage/attractFlowLink/index.vue
#	src/views/salesleads/actCodeManage/attractFlowLink/landingPage/cardView.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/components/select-clerk/selected-clerk-item.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/index.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/actCodeDetailInfo.vue
#	src/views/salesleads/components/dataDetail.vue
#	src/views/salesleads/components/welcomesItem.vue
#	static/css/public.css