# Conflicts:
#	dist/css/app.762f3b4bbaf0f954d47ff1408aeb3106.css
#	dist/css/app.b519d5f1d01fe35ca4a29120f33dc338.css
#	dist/css/app.d30b3be0ce282975dbeaf93943712da6.css
#	dist/index.html
#	dist/js/10.ccef2d43649dc2d7a9d7.js
#	dist/js/10.ee9b5530520a9311232a.js
#	dist/js/11.5faad302060a6fc16c52.js
#	dist/js/14.9198d17d3f402b9d9b84.js
#	dist/js/15.02d09171c81b9d839652.js
#	dist/js/15.ee806b049a3fb549c32c.js
#	dist/js/16.4be539a0edfddc9ecd63.js
#	dist/js/43.85d013cc084561cb92e1.js
#	dist/js/44.116c855829dadb726059.js
#	dist/js/44.2cf16f169bc0126bcd90.js
#	dist/js/48.1d834faf203c73b863ca.js
#	dist/js/58.4ced35b64936f0147996.js
#	dist/js/59.252f70a90cde2e6eca78.js
#	dist/js/60.f58b2745b7b3d40913f4.js
#	dist/js/61.5b2a9468c3878b2f307f.js
#	dist/js/62.e97122171e8f7ad71fd5.js
#	dist/js/73.d3aa406ef3dfb1751c5c.js
#	src/common/filters/custom.js
#	src/components/allCustomers/order-list/order-table.vue

* master:
  dist
  气泡窗问题
  冻结会员-气泡窗不展示问题
  dist
  update: dist
  fix: 客户日志时间选择器

# Conflicts:
#	dist/index.html
#	dist/js/1.6c61263d0e3f3e044c87.js
#	dist/js/18.87eb6cf0a711922d58cf.js
#	dist/js/19.2c0000f098dd2f6bfa7c.js
#	dist/js/19.6d55a4c298295eea1012.js
#	dist/js/20.d34bbc629d9847511a2a.js
#	dist/js/21.b1b91c1b1a5ecc9b4656.js
#	dist/js/22.6d6ae853fc6bd3e3578d.js
#	dist/js/22.8e0836e7a1bed2491d1b.js
#	dist/js/23.49c5f70aa2df001ce96a.js
#	dist/js/23.81bfb18b381b196eba30.js
#	dist/js/24.4d1917f8707e2ee05456.js
#	dist/js/31.1cf3627d20c9983203be.js
#	dist/js/5.bf4f6e569014a94bfdf1.js
#	dist/js/app.836d5b7d9feb056b6723.js
#	dist/js/manifest.c6ca282cb03e1a5f131e.js

* feature/7月基础一异常冻结会员:
  白名单生日格式化

生日值为-1的情况 以及白名单生日格式

生日值为 -1 或者 0情况

# 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