* feature/停复机1:
  提示 占用 高度计算
  移动横栏位置 不改变框架高度计算
  好办功能即将到期提示
  消息通知组件

# Conflicts:
#	src/components/layout/index.vue

# Conflicts:
#	config/proxyList.js
#	dist/index.html
#	dist/static/css/public.css
#	dist/static/js/13.af8dbda8aead2733f959.js
#	dist/static/js/13.ddc51971d11c6174bcf9.js
#	dist/static/js/14.d30ac3318aba3c694af0.js
#	dist/static/js/55.32d0cfad0434efe88df4.js
#	dist/static/js/55.69a4f2e343c6e359c998.js
#	dist/static/js/58.f36811725453515a074f.js
#	dist/static/js/6.af2182f100f8821a40bf.js
#	dist/static/js/6.ccc115e5d1d364c68ae0.js
#	dist/static/js/64.705f7b2b5cc9ff15988f.js
#	dist/static/js/64.8d2437cad744ac931b05.js
#	dist/static/js/64.dd9aef45a5636b4848a2.js
#	dist/static/js/65.1f818ef70dc8c00a03c9.js
#	dist/static/js/65.b0309cc961e1158b203b.js
#	dist/static/js/65.eba6f55d8e9a3f5f1556.js
#	dist/static/js/66.ef9b45f25efacaeb2a6e.js
#	dist/static/js/67.5d5badfc2a167e2a371b.js
#	dist/static/js/68.75ce985994b52d0989ac.js
#	dist/static/js/69.b77aebc03c0cc5b20a6c.js
#	dist/static/js/7.11d61d73ec60073ba490.js
#	dist/static/js/7.e491d2af84dddb6f9f02.js
#	dist/static/js/7.eaa096334749222ac860.js
#	dist/static/js/70.4f90c0e655cfb7093805.js
#	dist/static/js/71.f223f08905ddcbf1c937.js
#	dist/static/js/72.b88dade8d03805e3b11d.js
#	dist/static/js/78.204b526b6cd4d67e553a.js
#	dist/static/js/78.f9f633b0110073618c51.js
#	dist/static/js/79.943a640961fbe752b2a0.js
#	dist/static/js/79.d4442b6b149ba7767c8d.js
#	dist/static/js/8.7c448ccc4b6fae94c097.js
#	dist/static/js/80.1fc8518538ae82357f14.js
#	dist/static/js/80.8a1971a7fe9554fc8961.js
#	dist/static/js/81.682025cfd603234ee193.js
#	dist/static/js/82.6a924ac623560ecb3e98.js
#	dist/static/js/83.507a9073cd1259c8461b.js
#	dist/static/js/84.46cc349ea4f1b368c8e9.js
#	dist/static/js/85.e5439abe451416c8a344.js
#	dist/static/js/86.68ef1ed9db41423ce521.js
#	dist/static/js/87.3406472bbdb16e57c8d8.js
#	dist/static/js/87.c168a76e32bf6449fedb.js
#	dist/static/js/88.14fe0fab15433b4cde0f.js
#	dist/static/js/88.6370bc1d598bbd93ef7e.js
#	dist/static/js/89.f558f43eff906e67634b.js
#	dist/static/js/89.f57a97e9db4579af197d.js
#	dist/static/js/90.1563292e4aeb4451bb57.js
#	dist/static/js/90.887de35cf87c4c403823.js
#	dist/static/js/99.2aabcd62a4fc5babb358.js
#	dist/static/js/app.7089d458b773be08453e.js
#	dist/static/js/app.8a2e0134f7f2aa3e08e5.js
#	dist/static/js/app.c9e43a96e892d30b17b1.js
#	src/components/common/selectShop.vue

# Conflicts:
#	src/components/layout/index.vue

This reverts commit 6c0a1f13.

This reverts commit 69c0adcd.