# Conflicts:
#	dist/css/app.2fd1fed98e2e7189782da5f2c81ce8e0.css
#	dist/css/app.76667ad0e956d16e2f8fc3deeb24e5b6.css
#	dist/css/app.d30b3be0ce282975dbeaf93943712da6.css
#	dist/index.html
#	dist/js/10.7ab742a58a02e0167515.js
#	dist/js/11.5faad302060a6fc16c52.js
#	dist/js/11.773f8ce5a3554d6a2290.js
#	dist/js/16.9e63160ee1bbfe4e0df2.js
#	dist/js/18.8ef114dfe3fc865dcb80.js
#	dist/js/19.6d55a4c298295eea1012.js
#	dist/js/20.dbd363cffb02244ad1e4.js
#	dist/js/22.8e0836e7a1bed2491d1b.js
#	dist/js/23.29c43c521c491cf58314.js
#	dist/js/23.49c5f70aa2df001ce96a.js
#	dist/js/27.96651f51ddf7697fa082.js
#	dist/js/31.1cf3627d20c9983203be.js
#	dist/js/35.1e34e7535d7b65751d7c.js
#	dist/js/36.02fd2eb2381b2716abab.js
#	dist/js/38.ca0d1c71f2684c00bab7.js
#	dist/js/39.dc34a7975f628007b449.js
#	dist/js/40.45e9d414d5b0f89a7662.js
#	dist/js/41.bd2e9ac18d5b89991749.js
#	dist/js/42.d09f640721bb1b1c6612.js
#	dist/js/43.ce5a920e7f67a3d62932.js
#	dist/js/43.d1e8f1ae6b880b878f09.js
#	dist/js/43.e49f64d2233fc2046a47.js
#	dist/js/44.2cf16f169bc0126bcd90.js
#	dist/js/45.9dc1fa1473b9558e53cc.js
#	dist/js/46.69b1cc682929609634f5.js
#	dist/js/47.706b1a1a48234e7dc6bc.js
#	dist/js/48.1d834faf203c73b863ca.js
#	dist/js/49.0f187fb88b68e9236bc3.js
#	dist/js/49.724a7e93a8f6c32e1af8.js
#	dist/js/50.4feb108e7df17080b1f8.js
#	dist/js/51.6917ff907c2309dfb896.js
#	dist/js/51.cc484e1358deec9b8b97.js
#	dist/js/51.daffe2acc856da0e7ece.js
#	dist/js/52.867cc7f0a810c03e60bd.js
#	dist/js/53.f6fddece2f8a1ca46df1.js
#	dist/js/55.c167452aa4127822480d.js
#	dist/js/58.4ced35b64936f0147996.js
#	dist/js/58.8e71a0f8326ef3fab3d9.js
#	dist/js/59.cd7bd4763634cab002ae.js
#	dist/js/59.e6ecb5fd1477a5d6bcf8.js
#	dist/js/6.34ad93a59436f2820535.js
#	dist/js/6.402a317917905ea64433.js
#	dist/js/6.dd3a10ab218b33f148cb.js
#	dist/js/60.7c9b829d5509b3e8fe3c.js
#	dist/js/60.f58b2745b7b3d40913f4.js
#	dist/js/62.a4154ad1b8cfc3b7e93b.js
#	dist/js/63.8f0f30e02e5f5bb55f08.js
#	dist/js/63.ab7976c7cf6a82aa023b.js
#	dist/js/64.23a5c96d9ab810e7cc5c.js
#	dist/js/64.351a81f765b2eb2fff4f.js
#	dist/js/65.39ac9e05abfa7c299208.js
#	dist/js/65.8d9c5eee685da964ec92.js
#	dist/js/65.eff1e24f2519f420f979.js
#	dist/js/66.b9e4d7801529c69b6248.js
#	dist/js/66.da48bb2b2e79132bba88.js
#	dist/js/66.eb4ed5dba1bf46814640.js
#	dist/js/67.166da148fe61e9ccc3a0.js
#	dist/js/67.1da9969f3e84967f9b18.js
#	dist/js/67.4986d6a575a2066f0149.js
#	dist/js/68.5fd252e641e63df5cf3d.js
#	dist/js/68.bf8bbac2270dce77aac0.js
#	dist/js/69.aeefbf2925f6ad335e95.js
#	dist/js/71.6c511878bfa1846b1d39.js
#	dist/js/72.57cd21fdc46060fbe96f.js
#	dist/js/73.116edcc87a00a45485c5.js
#	dist/js/73.d3aa406ef3dfb1751c5c.js
#	dist/js/73.f0f7e229e47738da672a.js
#	dist/js/9.7fba38b9f516a52ad577.js
#	dist/js/9.cdc470837fa450952a8d.js
#	dist/js/9.f46f61f2f56f3dea4f18.js
#	src/components/wechatmembers/cardvoucher.vue

# Conflicts:
#	dist/index.html
#	dist/js/13.4d00de7f358c38c5a5aa.js
#	dist/js/14.f2c98b99c421be152edb.js
#	dist/js/16.4be539a0edfddc9ecd63.js
#	dist/js/16.9e63160ee1bbfe4e0df2.js
#	dist/js/17.4e5eac2c993d26f5d0d3.js
#	dist/js/17.a8702cc20df642a1c8a2.js
#	dist/js/18.917500e3b36e8be1a80c.js
#	dist/js/36.b9ea79092488f1214206.js
#	dist/js/38.2efcf9fa8462b2948e21.js
#	dist/js/39.7ff6c2ba1487d56fcef1.js
#	dist/js/4.05853d6d29681342a3d8.js
#	dist/js/4.206e80799afa87efd11d.js
#	dist/js/4.ea8bb341a660613445f6.js
#	dist/js/41.a5957e6864673c79afea.js
#	dist/js/42.24f846da5a615ad03932.js
#	dist/js/42.86483a2e1d0043a1b3b7.js
#	dist/js/43.adda8598ccbc30b77bff.js
#	dist/js/43.ce5a920e7f67a3d62932.js
#	dist/js/44.00461f28eabe1904c38c.js
#	dist/js/45.b00fc76a11c3251537cd.js
#	dist/js/45.b982df3d51c78dc898d5.js
#	dist/js/46.69b1cc682929609634f5.js
#	dist/js/46.a20dfbf554e9f89f86c7.js
#	dist/js/46.c8012342892d41b713a5.js
#	dist/js/47.3d5bc75156091e718207.js
#	dist/js/47.be831809812e0ecd90e2.js
#	dist/js/47.c366b68faef3f0b0552e.js
#	dist/js/48.45d9bd13ecef14139f13.js
#	dist/js/48.93aa558e44d710df4f91.js
#	dist/js/49.724a7e93a8f6c32e1af8.js
#	dist/js/49.89105a4ec7ba94789015.js
#	dist/js/5.c04e2d1875638f762aab.js
#	dist/js/50.b6aae173297058a469e1.js
#	dist/js/51.7cf96ad2793415cf2387.js
#	dist/js/52.5593490f0502bda69324.js
#	dist/js/52.867cc7f0a810c03e60bd.js
#	dist/js/53.2f2de0c278e80b3db043.js
#	dist/js/53.a5c0294dcd1f610ede44.js
#	dist/js/54.08fd719919cee3f28b8b.js
#	dist/js/54.4d9ffe228251ef31ee56.js
#	dist/js/55.c167452aa4127822480d.js
#	dist/js/56.e62493ebf392b7bc1d46.js
#	dist/js/57.ee00c18617b0bb3baca3.js
#	dist/js/58.d1fd02314e1d79b149ea.js
#	dist/js/6.13e1ac7366c55f444084.js
#	dist/js/6.2bb8a1447899510868c2.js
#	dist/js/6.402a317917905ea64433.js
#	dist/js/60.c8f9cd1054aa4ded0bd9.js
#	dist/js/62.7002c577dc154b360d70.js
#	dist/js/62.e97122171e8f7ad71fd5.js
#	dist/js/63.5ddb8eea7eabae4389f1.js
#	dist/js/63.a291eb9caa8a5c757321.js
#	dist/js/64.4d65d5cf62d48a17425b.js
#	dist/js/64.c990d68a129b5df93f50.js
#	dist/js/65.0fc055ad4717d8f1a4b3.js
#	dist/js/65.8d9c5eee685da964ec92.js
#	dist/js/66.da48bb2b2e79132bba88.js
#	dist/js/7.7fd10209e0c5d70e6904.js
#	dist/js/vendor.777d0e930a11c825db47.js
#	src/components/allCustomers/index.js
#	src/components/axios/url.js
#	src/components/wechatmembers/cardvoucher.vue

* feature/7月基础一异常冻结会员: (79 commits)
  图片更换
  距离调整
  会员卡券核销
  table-sticky
  表单滚动到 报错的位置
  UI 变更  交互优化
  分页器距离列表距离修改
  异常规则配置 保存交互
  会员信息 增加鼠标移上去的小手
  异常规则配置  提示优化
  其他页面 影响到了 组件里subtitle标签 问题
  搜索结果导出 icon
  样式兼容
  兼容测试
  尝试解决
  部分浏览器版本 deep 不生效问题
  no message
  多选
  no message
  冻结弹窗 自动撑开 样式优先级
  ...

# Conflicts:
#	src/components/allCustomers/index.js
#	src/components/axios/url.js
#	src/components/wechatmembers/cardvoucher.vue

* feature/7月基础一异常冻结会员:
  图片更换
  距离调整