# Conflicts:
#	dist/index.html
#	dist/static/css/public.css
#	dist/static/js/35.7e2c22b09d48496fae38.js
#	dist/static/js/36.1012eb659b32466dcdde.js
#	dist/static/js/40.f0af54d2bd4734f497c2.js
#	dist/static/js/41.622ea41858dfd53f60bd.js
#	dist/static/js/41.e0a6690a7da361021db8.js
#	dist/static/js/42.16f1c4be72ca23c622d9.js
#	dist/static/js/5.7a62062ecd7095619dee.js
#	dist/static/js/54.ce1e30a9dc7a4f5170c3.js
#	dist/static/js/55.07295384f3dc9f7a4981.js
#	dist/static/js/56.d6839634bec591be6b09.js
#	dist/static/js/60.1c7701ef6f5b18b8d533.js
#	dist/static/js/61.14a359600fd740f5d245.js
#	dist/static/js/61.53f113f29db81561850e.js
#	dist/static/js/62.58dcdfc5267c3d0d3a09.js
#	dist/static/js/62.e0acd353801c964887f4.js
#	dist/static/js/63.5afc768d50bb8f5f4b36.js
#	dist/static/js/77.2b56dfca068058f0d2fe.js
#	dist/static/js/79.372b8e650fb41b358dc3.js
#	dist/static/js/80.087eab6b70391468f9fa.js
#	dist/static/js/82.42ac6cf34a8d5f977c01.js
#	dist/static/js/83.305c3ffdb09a30a910cb.js
#	dist/static/js/84.b762704bfe5cedb22dfe.js
#	dist/static/js/85.21c5a01ba6d0a776ae5e.js
#	dist/static/js/86.26924b4a675763780a27.js
#	dist/static/js/87.4c389fefb1ba521cc52e.js
#	dist/static/js/87.f05750f4be735d794fa5.js
#	dist/static/js/89.191c546f3945558e3105.js
#	dist/static/js/9.af884ac4a314b4b3bc6b.js
#	dist/static/js/90.76d83151e4c5325cd71d.js
#	dist/static/js/90.8328de831fe7a4d46b88.js
#	dist/static/js/91.2785ede41f249908d3e9.js
#	dist/static/js/91.64ad30b4854f335b1896.js
#	dist/static/js/92.25ed17c5be90edf4f562.js
#	dist/static/js/92.b3f8acc4de02b5c666b9.js
#	dist/static/js/93.f8ccef1d640cc1bd5a75.js
#	dist/static/js/94.0960252e833bce31acf3.js
#	dist/static/js/95.ab013459fd554d5bac03.js

Featrue/销售线索

See merge request !2

# Conflicts:
#	src/api/api.js