* feature/停复机:
  看效果

# Conflicts:
#	src/components/notice/notice.vue

* feature/停复机:
  调试

# Conflicts:
#	src/components/notice/request.js

# Conflicts:
#	dist/index.html
#	dist/static/css/app.3bfc94b05d44f64e710bebceaedf12ab.css
#	dist/static/css/app.9c8f14be47d40402863893da03f167ab.css
#	dist/static/css/app.be32293759536f9ddd441d82bfff48e6.css
#	dist/static/js/10.0c309eceb04d492e8695.js
#	dist/static/js/10.4b218819b95e833f475f.js
#	dist/static/js/10.926a3dee4527ab56b53b.js
#	dist/static/js/100.defecbf0c0800bde5049.js
#	dist/static/js/101.a65315ff295ae4a74789.js
#	dist/static/js/102.828266f1ce93e0809abd.js
#	dist/static/js/103.abb0d93d39774ddc17b8.js
#	dist/static/js/103.aef19e99d3bcfdf065b6.js
#	dist/static/js/103.f365ce110e2febef23d2.js
#	dist/static/js/104.507ea7690e0372b1b9f1.js
#	dist/static/js/104.7ddd6d683f54c5c651e4.js
#	dist/static/js/104.7f28165e2d0dc3132611.js
#	dist/static/js/105.9a55b9e62ee0791e0a91.js
#	dist/static/js/105.a6ec2f20981d7b73244b.js
#	dist/static/js/106.bc8af3d6ea53d2eb4793.js
#	dist/static/js/107.fa3169c4d0074531f93f.js
#	dist/static/js/11.9635e7dd1fc15af93e65.js
#	dist/static/js/117.b8435d31d2390eddabc9.js
#	dist/static/js/119.815c5bbf3c9b520f7915.js
#	dist/static/js/120.65db4c9d5f8dd3985289.js
#	dist/static/js/120.b71e87c7102749f9755c.js
#	dist/static/js/120.f7f7c955949a4e9f7c3c.js
#	dist/static/js/121.2edbff142c990b47fc8b.js
#	dist/static/js/121.90d82637972a7cba151d.js
#	dist/static/js/122.d1e263bb9f3961d8fb23.js
#	dist/static/js/15.7a777dda14f783d55a16.js
#	dist/static/js/16.03efbc3fd86def29dffe.js
#	dist/static/js/16.60878e9d5028033c3e0d.js
#	dist/static/js/16.bf9d91ee353db01f6587.js
#	dist/static/js/17.26dae293b49ed9495f6a.js
#	dist/static/js/18.1444a7372b6a1bf4cca2.js
#	dist/static/js/18.2a1b0310dd269490ab33.js
#	dist/static/js/18.604495afc27c2aae0e24.js
#	dist/static/js/19.826c2ca2446f892c288c.js
#	dist/static/js/20.98e5b2e41d73dabc73fb.js
#	dist/static/js/24.80ab4058d2f005daf64f.js
#	dist/static/js/24.c0bbdbc007ccb17d9a7e.js
#	dist/static/js/25.d76b1b63d5489c1da0d6.js
#	dist/static/js/26.91abd00c5c82c9b5326f.js
#	dist/static/js/26.9bcaea2d90c17205d28d.js
#	dist/static/js/27.ae015a0c9889eb17793f.js
#	dist/static/js/29.609b38a8c86e6e684f01.js
#	dist/static/js/30.060b9cefa8769c93002d.js
#	dist/static/js/30.291f077719b2dc89e2ee.js
#	dist/static/js/30.4056b61db48119d2a1c2.js
#	dist/static/js/31.b831fe35c93d6874a3ad.js
#	dist/static/js/31.f831c34cfed019396376.js
#	dist/static/js/32.0b47a2be2dfa08b4d46d.js
#	dist/static/js/32.6bcf2c07765d91629fd8.js
#	dist/static/js/33.7905d75f9175f609d621.js
#	dist/static/js/33.836860ac4eb59b217c85.js
#	dist/static/js/33.c73648c72afd73f78c8e.js
#	dist/static/js/34.9a67cbaa50bb68eb9b8b.js
#	dist/static/js/36.ae03ce0d57e0453bba36.js
#	dist/static/js/37.0d7f931b63ac72452f7b.js
#	dist/static/js/38.63149e5f6af8ebdbd9d8.js
#	dist/static/js/39.078f31215a057d9c3cf7.js
#	dist/static/js/40.a21604896caab2ce2991.js
#	dist/static/js/42.4f6eb774951a18ef66aa.js
#	dist/static/js/43.74ff016eb168122f00f4.js
#	dist/static/js/43.7fb1505239660b262132.js
#	dist/static/js/43.8fd4c4cc5cbfefdef418.js
#	dist/static/js/44.6b085ba5eccd8e026fb4.js
#	dist/static/js/44.c23ddea20d484ab56d54.js
#	dist/static/js/45.d646076741224604ef4e.js
#	dist/static/js/46.456a523c163e3efa607e.js
#	dist/static/js/46.a481f6d1d3198cd521c9.js
#	dist/static/js/47.9170fd12e2cc0ff27c48.js
#	dist/static/js/47.a5eeb72656805944f910.js
#	dist/static/js/47.eb1530ae96536d71d1aa.js
#	dist/static/js/48.008485a57db12426a394.js
#	dist/static/js/48.4817f5ed194c644c0d5c.js
#	dist/static/js/48.c3043875da9fd66309d1.js
#	dist/static/js/49.0ed6bdb653c4a08462ef.js
#	dist/static/js/49.1c09878e1bfc37c00aa4.js
#	dist/static/js/49.55ed36c94931276ccedd.js
#	dist/static/js/50.2e74d635a24df55c84cc.js
#	dist/static/js/50.68f46d4224c62d60fdfb.js
#	dist/static/js/50.fac1acfb2c95a33be978.js
#	dist/static/js/51.75c13e0a19dc0f54c1f5.js
#	dist/static/js/51.77dbce80cc49cd17b855.js
#	dist/static/js/51.b131f35cc29d9abe2d78.js
#	dist/static/js/52.2186bd4be4408d59d718.js
#	dist/static/js/52.3eae3a41095ac2d7c725.js
#	dist/static/js/52.e138c4acff5b112b3f6b.js
#	dist/static/js/53.515104094303f44a2d44.js
#	dist/static/js/53.5eb6577a05917a822fa5.js
#	dist/static/js/53.dffeaa8a7fd839223671.js
#	dist/static/js/54.000e875fc44a37d1bffa.js
#	dist/static/js/54.0fbc13159deb1edc720a.js
#	dist/static/js/54.73a73e97a324031b19d1.js
#	dist/static/js/55.39b3f688e70f2361fd42.js
#	dist/static/js/55.978f9b31e9bf16c8ae86.js
#	dist/static/js/55.b6e727b20fb3f6b2db14.js
#	dist/static/js/56.277a12e6cefeb405027e.js
#	dist/static/js/56.2b38e758a69af9afc93d.js
#	dist/static/js/56.526593ac3d2a5913eba8.js
#	dist/static/js/57.07a244d52c166f8884a0.js
#	dist/static/js/57.625a26bf120b0add1aea.js
#	dist/static/js/58.46417183229f03d64a87.js
#	dist/static/js/58.48dd15b4f4a978829753.js
#	dist/static/js/59.26a036286f9426a81cf8.js
#	dist/static/js/59.ffbf641c9277365ac70f.js
#	dist/static/js/60.37d504b0e79dcadcd2e6.js
#	dist/static/js/60.9218c4ac8f35556ba343.js
#	dist/static/js/60.f9c9af8af1e35327ab25.js
#	dist/static/js/61.974a1ebda8e4385bd0c8.js
#	dist/static/js/61.c3c914f1b672c38a2081.js
#	dist/static/js/61.f9818758ba86dd5a1485.js
#	dist/static/js/62.4d347da89bc6d3304aa4.js
#	dist/static/js/62.5530c678ce4cd6fab6b6.js
#	dist/static/js/62.e3e661b95f2fc5c08e05.js
#	dist/static/js/63.5d0fae117f5bc0d9b4f8.js
#	dist/static/js/63.8b3a5a75056faef700dd.js
#	dist/static/js/63.dff4a78ad695912a1010.js
#	dist/static/js/64.1abf125d3ab055fb55e8.js
#	dist/static/js/64.8d2437cad744ac931b05.js
#	dist/static/js/65.b0309cc961e1158b203b.js
#	dist/static/js/69.f7b043ad7ce3c2f2657b.js
#	dist/static/js/7.11d61d73ec60073ba490.js
#	dist/static/js/71.60cc700afcf1207abe7a.js
#	dist/static/js/72.c0c05739a2671f510e21.js
#	dist/static/js/73.b967f5ac39922f7dd4c4.js
#	dist/static/js/73.c333b24a4f1db17cf7c6.js
#	dist/static/js/74.1c9d638f45cb6b84dc77.js
#	dist/static/js/74.ab7ad420ed9f3eacbf30.js
#	dist/static/js/74.c884af2dec5e08af0cd2.js
#	dist/static/js/75.7822e81d7431dc2670bb.js
#	dist/static/js/75.7a4d01e46c83a23cc281.js
#	dist/static/js/75.b3ca1a8296d4b0fefcc2.js
#	dist/static/js/76.1898057c255763776a04.js
#	dist/static/js/76.37de36bf75f1fdcc36fa.js
#	dist/static/js/77.5fe1089948cad2f73adf.js
#	dist/static/js/8.38b5a485a038ed5d6139.js
#	dist/static/js/80.1fc8518538ae82357f14.js
#	dist/static/js/80.8a1971a7fe9554fc8961.js
#	dist/static/js/81.54e4e605a996c3e758eb.js
#	dist/static/js/81.682025cfd603234ee193.js
#	dist/static/js/81.ed9f776c33449e4502f5.js
#	dist/static/js/82.c004d3c85ae0b8b1c7d6.js
#	dist/static/js/82.f1f0b8be9fe8c0a48f49.js
#	dist/static/js/83.507a9073cd1259c8461b.js
#	dist/static/js/83.688fd63f6d76e2a75837.js
#	dist/static/js/83.efa5747adf2ab8c533d6.js
#	dist/static/js/84.46cc349ea4f1b368c8e9.js
#	dist/static/js/84.7bf80d8360c91aba0639.js
#	dist/static/js/85.9b91b93494090f3a5720.js
#	dist/static/js/85.bc319f9dcf7281f189e5.js
#	dist/static/js/85.fe1eb92ba7ea5dfc20c7.js
#	dist/static/js/86.43d790a13396955db2e6.js
#	dist/static/js/86.5446e2acdbbb4672a578.js
#	dist/static/js/86.c27e75ccbe45f2579a16.js
#	dist/static/js/87.ad99bfdb6fc3a35bdbc4.js
#	dist/static/js/87.c2113c68cac9212a020c.js
#	dist/static/js/87.ec1f11e1257697fca79b.js
#	dist/static/js/88.4d9c7c4baf5d8ad45e6d.js
#	dist/static/js/88.7852e68703308154096d.js
#	dist/static/js/88.aa866576b636f2a9dc8f.js
#	dist/static/js/89.1bf2e3a1d1c77360eb04.js
#	dist/static/js/89.1cda1af6c67639c4edff.js
#	dist/static/js/89.f558f43eff906e67634b.js
#	dist/static/js/90.994dd7cce539ae77968d.js
#	dist/static/js/90.b4caa9bdafe320c8b212.js
#	dist/static/js/91.58633bbdb65bf7a99314.js
#	dist/static/js/91.cb219ccb86704f454c6c.js
#	dist/static/js/92.63c7be6a4fcc2958be9a.js
#	dist/static/js/92.b8b28f280177a918217c.js
#	dist/static/js/93.b5559284cc5caf710b07.js
#	dist/static/js/94.b20d44b6093de2a0748d.js
#	dist/static/js/94.c42e61e21bb25d9e0150.js
#	dist/static/js/95.1cd2779682b88f36cc44.js
#	dist/static/js/95.b077046d25021e946208.js
#	dist/static/js/96.168bdc512c663b26a069.js
#	dist/static/js/97.286de4a55de4f21aefa4.js
#	dist/static/js/97.56e642d412b2fc947deb.js
#	dist/static/js/98.f395537903ef38a74302.js
#	dist/static/js/app.3b503dd8d45a76648324.js
#	dist/static/js/app.9378df32811103867885.js
#	dist/static/js/app.cbcfc2c4d42d3830469f.js
#	dist/static/js/vendor.60ed63b793f3af950d32.js