# Conflicts:
#	dist/index.html

# Conflicts:
#	dist/index.html

# Conflicts:
#	dev/index.html
#	dev/static/js/1.0600487d59c5fe505c33.js
#	dev/static/js/10.d706827cbdc5254e3fdd.js
#	dev/static/js/11.9c1bcdffcd7449ad8ead.js
#	dev/static/js/12.b49b4e61e6ffc8837243.js
#	dev/static/js/13.562948986e7253518ccb.js
#	dev/static/js/15.e5683674197c9032c0a3.js
#	dev/static/js/16.4c13c8ce2ef6d3aa8afa.js
#	dev/static/js/17.357191e71417740a99e6.js
#	dev/static/js/18.7343fb68f346d90f434a.js
#	dev/static/js/19.5419806bb3fe8ee2aea8.js
#	dev/static/js/20.245207d884a732a4fc44.js
#	dev/static/js/21.42c854815109ad0a3a9e.js
#	dev/static/js/23.d12ac02da0ef0cf1e498.js
#	dev/static/js/24.6e82a37859b8d509d00b.js
#	dev/static/js/25.4fc9444ca6deb21f3565.js
#	dev/static/js/26.5748f88e57bead329fd8.js
#	dev/static/js/29.54753950ccac3f0a2eae.js
#	dev/static/js/30.fd6481b29e02654f3d47.js
#	dev/static/js/33.a3532b2a521580d68f55.js
#	dev/static/js/34.d05283bd452c1bdfdfda.js
#	dev/static/js/35.592bb1e1993fc1c17c3e.js
#	dev/static/js/36.2090081bb8cb1cd36ed5.js
#	dev/static/js/37.6a949fecb3848b8ed5dc.js
#	dev/static/js/38.14725481083cbe7e8813.js
#	dev/static/js/39.1850ebd049828b66516d.js
#	dev/static/js/4.8b79b780e51a00b3b0dd.js
#	dev/static/js/40.77c98985dec00a5d0a78.js
#	dev/static/js/41.8e65dbb2972f5a058c59.js
#	dev/static/js/42.b04c0ee409370b11dc62.js
#	dev/static/js/44.252c4eab386bbbc2c048.js
#	dev/static/js/46.9f886bc933b3fe8f148d.js
#	dev/static/js/47.cced44fa89bb8a45e248.js
#	dev/static/js/48.2746e81bee8476f4eef3.js
#	dev/static/js/49.0804b3e789249ffb13e4.js
#	dev/static/js/5.1ad3715688ba614a89c9.js
#	dev/static/js/50.e2497607906771e8a51d.js
#	dev/static/js/51.1c1af367e07105496056.js
#	dev/static/js/52.a10d402ffacda979e817.js
#	dev/static/js/53.e5a4f00f335bfb673cc2.js
#	dev/static/js/54.0f89478c9ecd806458bc.js
#	dev/static/js/55.bd945fe5b5c8c0bb2b72.js
#	dev/static/js/56.ce91110d885373a08d50.js
#	dev/static/js/57.51f393352f0ec5d76ae3.js
#	dev/static/js/59.4968847f212432c42fe3.js
#	dev/static/js/61.96ede34693a4d6146eca.js
#	dev/static/js/62.e2e9356ed58850f95014.js
#	dev/static/js/63.67648163d395a99648d4.js
#	dev/static/js/65.8ee2b662d293076bf338.js
#	dev/static/js/67.862212a2a810e5d15a38.js
#	dev/static/js/68.0fdbce1458f47cfba176.js
#	dev/static/js/7.a69581d0f56101b87666.js
#	dev/static/js/70.dc8bd889c99b8af29fe0.js
#	dev/static/js/71.057a5d7bb9952044d7e5.js
#	dev/static/js/vendor.fdfa49e267f48089768a.js
#	dist/index.html
#	dist/static/js/1.cddba729a768bb71961e.js
#	dist/static/js/10.606373ba89afa4d56570.js
#	dist/static/js/11.a65e24beefb035d8ced7.js
#	dist/static/js/11.cec0aab3845a96fcedc4.js
#	dist/static/js/12.3b4e3ce53f97f22c3e32.js
#	dist/static/js/12.a649f6dfb1469e22533f.js
#	dist/static/js/13.4939db30310368eb1e7c.js
#	dist/static/js/13.ec2412fabd0bc31862e7.js
#	dist/static/js/14.c354f939bf02964921f9.js
#	dist/static/js/14.c504a593d98cd821c993.js
#	dist/static/js/15.84a4187d276b0c823291.js
#	dist/static/js/15.f651603e14eb2603c93d.js
#	dist/static/js/16.124c4b69437c61a8e63b.js
#	dist/static/js/16.a5d19af7dab2bf0fea84.js
#	dist/static/js/17.8c087629d63f32d7c113.js
#	dist/static/js/17.9264dacd2da9b78aa5c1.js
#	dist/static/js/18.00eea99e1dd127dddd9a.js
#	dist/static/js/18.9a3b62055ea7cba2cbfc.js
#	dist/static/js/19.565fdddb169e63a51860.js
#	dist/static/js/19.d4b25f69007a1d7d3013.js
#	dist/static/js/2.2f25f764a24b0d66d07f.js
#	dist/static/js/20.259ebc25aa042acdb3bc.js
#	dist/static/js/20.434d6cc4b2245fed28fb.js
#	dist/static/js/21.43a39b6c08600e73d1f3.js
#	dist/static/js/21.d45ccb96ff29fc7a4e7b.js
#	dist/static/js/22.1cddb1b53a5ed07fd1ad.js
#	dist/static/js/23.0faaca60dd95f15ccf9f.js
#	dist/static/js/23.67465002260a8c56a3cf.js
#	dist/static/js/24.67a9adf6d4a2831f26be.js
#	dist/static/js/24.9c0994b627bfb94256bf.js
#	dist/static/js/25.dac1d46c0459bc0c10b2.js
#	dist/static/js/25.eef27b0bbf52fac4038e.js
#	dist/static/js/26.2c67df9580621b3083e1.js
#	dist/static/js/26.89208721f9d0301e37c3.js
#	dist/static/js/27.17e01c8332ed4f36d608.js
#	dist/static/js/29.0248ba9f0e91ee878918.js
#	dist/static/js/29.4f72b6f08d3d7e3f3145.js
#	dist/static/js/30.3526bb458a952a300b49.js
#	dist/static/js/30.37f95b5f8bcd11592f4e.js
#	dist/static/js/31.e72356de4a24fd8f9b7c.js
#	dist/static/js/32.9763df6b8650ad125714.js
#	dist/static/js/33.2ba7edc4281e89804738.js
#	dist/static/js/33.e6f5afb4008483f98325.js
#	dist/static/js/34.49de759dd163a1140670.js
#	dist/static/js/34.ce49fdcc5f87253d62d8.js
#	dist/static/js/35.0cd1fdc00406dc213875.js
#	dist/static/js/35.0d03e9be68ecdef40e8a.js
#	dist/static/js/36.3579a150fc29bfc488eb.js
#	dist/static/js/36.56efd8a59865cb817d49.js
#	dist/static/js/37.e37caf9eadacc34a867b.js
#	dist/static/js/37.f1b8d5433c0c203c7228.js
#	dist/static/js/38.eee8afaa484e063f5e79.js
#	dist/static/js/38.f10c83106ef0105243bc.js
#	dist/static/js/39.3f713e415418fbdd81f4.js
#	dist/static/js/39.fd700f4e89ae84db0ec7.js
#	dist/static/js/4.1b3d7eafb022fdf774bb.js
#	dist/static/js/40.3ce4868371add5a170a8.js
#	dist/static/js/40.bfabf7a09c813c46fc81.js
#	dist/static/js/41.2e6add3e5228957837aa.js
#	dist/static/js/41.b2089937b145f5d61101.js
#	dist/static/js/42.3900d5954e355c2b0432.js
#	dist/static/js/42.3ac3fa27264b12e53b45.js
#	dist/static/js/44.2df399a9bb05667a442e.js
#	dist/static/js/44.fd194cdb13393896cd30.js
#	dist/static/js/45.3cfcb08e3b9855e8fdba.js
#	dist/static/js/46.1ab3b82fc6d16002aad5.js
#	dist/static/js/46.cbdcc528baf6016a8760.js
#	dist/static/js/47.da73ad81ca29a3a31fc7.js
#	dist/static/js/47.f1d1b00916ead5f4d1b4.js
#	dist/static/js/48.0874b17d69582618c595.js
#	dist/static/js/48.f11ed37cbc7bd67b67ab.js
#	dist/static/js/49.879516e6b1e82c9195f3.js
#	dist/static/js/49.ee7c13f18e8772049969.js
#	dist/static/js/5.96e2e218ec55de303963.js
#	dist/static/js/5.bbaf8aa009ddaae5ab05.js
#	dist/static/js/50.19dd71251512b457dc85.js
#	dist/static/js/50.34c1b6e26bb4467231a1.js
#	dist/static/js/50.7697a77c69f5ef612e17.js
#	dist/static/js/51.b3a2727489446ecc1176.js
#	dist/static/js/51.cc5357bf9fb28bc96766.js
#	dist/static/js/52.3154b51701a24c09c6a4.js
#	dist/static/js/52.ac68a4ad3a28ad0e4b1f.js
#	dist/static/js/53.487cdde0d28217b7f5fa.js
#	dist/static/js/53.d5a8dbedc48af3e29054.js
#	dist/static/js/54.0b44009d42d94d6f483b.js
#	dist/static/js/54.cced81c9bdb3da2de818.js
#	dist/static/js/55.1261ee374d24772ba763.js
#	dist/static/js/55.831313ddb60d4b7d03d0.js
#	dist/static/js/56.292b6137792d3eec85b9.js
#	dist/static/js/56.3817359c8398b1c2f253.js
#	dist/static/js/57.1bb43261d1c17b9cb46a.js
#	dist/static/js/57.28319881f1417ca90d2c.js
#	dist/static/js/58.492c00c8eba0193d77b6.js
#	dist/static/js/58.5c0af4191b4ba0dec097.js
#	dist/static/js/59.71502dd68a0e34250e8f.js
#	dist/static/js/59.8bba19627410dde511d0.js
#	dist/static/js/6.2c45649982596cf38475.js
#	dist/static/js/6.34cf4703f756133943b9.js
#	dist/static/js/60.213a6f4da1a216347096.js
#	dist/static/js/61.39d8c7d1ec3e2fa53e4f.js
#	dist/static/js/61.501e14d14d68a3b6717f.js
#	dist/static/js/62.169505dfb661c6dc57c3.js
#	dist/static/js/62.23e2507eeb4a67e0535f.js
#	dist/static/js/63.1c8957947d73b5022757.js
#	dist/static/js/63.daefad2d63aa290c6242.js
#	dist/static/js/63.eefc3b412fe859403ff2.js
#	dist/static/js/65.3e867c2aeaec0da084e8.js
#	dist/static/js/65.8f777273e29178f5ebcb.js
#	dist/static/js/66.d6253f9960b5d617783b.js
#	dist/static/js/67.3467a1c5af7d3c313412.js
#	dist/static/js/67.43b0001333af80e3b005.js
#	dist/static/js/68.84a7ae508caaa9fdc2bc.js
#	dist/static/js/69.b13d7bd5066b84faa1ac.js
#	dist/static/js/69.e8ea7e239280f3335794.js
#	dist/static/js/7.d63f149603b281c7e4bd.js
#	dist/static/js/70.28067ea72292d2fb8ce6.js
#	dist/static/js/70.8f2e7635c47559ab3056.js
#	dist/static/js/71.4afa624b251d8392951f.js
#	dist/static/js/72.731bb386b3dd5a8b275e.js
#	dist/static/js/73.f0bb161f48dbfbc00b05.js
#	dist/static/js/8.2e75d3807e7ebec0e5d2.js
#	dist/static/js/8.4829277cb909c0d8d22d.js
#	dist/static/js/9.7dcc0706b51fe591340e.js
#	dist/static/js/app.a31a53fb57c5b8651d7e.js
#	dist/static/js/vendor.195a67a672e524ccd93c.js
#	dist/static/js/vendor.9cb480843b4d598128a9.js
#	src/components/teacherDetail/customer.vue
#	src/components/teacherDetail/replayed.vue
#	src/components/teacherDetail/task.vue
#	src/service/api.js

回访信息 修复 因接口并发导致接口返回503的问题
教师绑定用户 修复 弹窗分页不能点击的问题
提交客户管理 客户昵称和客户微信昵称的跳转(user里)

教师绑定用户 修复 弹窗分页不能点击的问题

用户列表（在用户详情界面时） 修复 点击菜单不能重新进入页面的问题