# Conflicts:
#	manifest.json
#	unpackage/dist/dev/.sourcemap/mp-weixin/api/api.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/api/http.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/api/model/index.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/api/model/info.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/api/model/login.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/api/model/vip.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/app.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/common/assets.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/config.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/baoyou-city/baoyou-city.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/component/home.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/component/my.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/component/recycle.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/manager/inspect-result.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/manager/inspect.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/manager/order-detail.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/manager/order.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/manager/staff-detail.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/manager/staff.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/manager/tui-apply-detail.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/manager/tui-detail.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/manager/tui.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/manager/user-detail.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/manager/user.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/mixins/tabBarMixin.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/subcomponent/about.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/subcomponent/add.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/subcomponent/admin_customer.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/subcomponent/admin_faq.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/subcomponent/apply.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/subcomponent/brand.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/subcomponent/customer.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/subcomponent/detail.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/subcomponent/edit.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/subcomponent/edit_profile.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/subcomponent/faq.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/subcomponent/inspection-detail.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/subcomponent/inspection-report.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/subcomponent/inspection.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/subcomponent/order.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/subcomponent/order_edit.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/subcomponent/orders.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/subcomponent/pickup.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/subcomponent/promo-qrcode.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/subcomponent/promotion-profit-detail.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/subcomponent/promotion-team.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/subcomponent/promotion-withdraw-record.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/subcomponent/promotion.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/subcomponent/promotion_info.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/subcomponent/recycle_rules.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/subcomponent/select.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/subcomponent/upgrad.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/subcomponent/wallet.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/subcomponent/withdraw.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/pages/wxUserInfo.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-icons/components/uni-icons/uni-icons.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-icons/components/uni-icons/uniicons_file_vue.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-popup/components/uni-popup/uni-popup.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-transition/components/uni-transition/createAnimation.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-transition/components/uni-transition/uni-transition.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uv-badge/components/uv-badge/uv-badge.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uv-button/components/uv-button/uv-button.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uv-divider/components/uv-divider/uv-divider.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uv-icon/components/uv-icon/uv-icon.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uv-line/components/uv-line/uv-line.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uv-loading-icon/components/uv-loading-icon/uv-loading-icon.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uv-safe-bottom/components/uv-safe-bottom/uv-safe-bottom.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uv-tabbar/components/uv-tabbar-item/uv-tabbar-item.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uv-tabbar/components/uv-tabbar/uv-tabbar.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uv-ui-tools/libs/function/digit.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uv-ui-tools/libs/function/throttle.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/utils/authorize.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/utils/index.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/utils/lib/md5.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/utils/oss-upload/common/crypto/base64.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/utils/oss-upload/common/crypto/crypto.js.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/utils/oss-upload/common/crypto/hmac.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/utils/oss-upload/common/crypto/sha1.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/utils/oss-upload/oss/OSSConfig.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/utils/oss-upload/oss/index.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/utils/pinyin.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/utils/router-interception.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/utils/timeUtils.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/utils/tree.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/utils/utils.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/wxcomponents/email-popup/email-popup.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/wxcomponents/privacy-popup/privacy-popup.js.map
#	unpackage/dist/dev/.sourcemap/mp-weixin/wxcomponents/protocol-dialog/protocol-dialog.js.map
#	unpackage/dist/dev/mp-weixin/common/vendor.js
#	unpackage/dist/dev/mp-weixin/project.config.json
#	unpackage/dist/dev/mp-weixin/uni_modules/uni-popup/components/uni-popup/uni-popup.wxml