# Conflicts:
#	Lighting.xcodeproj/project.pbxproj
#	Lighting/Resource/Images.xcassets/Home/shareLogo.imageset/Contents.json
#	Lighting/Resource/Images.xcassets/Home/shareLogo.imageset/shareLogo.jpeg
#	Lighting/Resource/Images.xcassets/shareLogo.imageset/Contents.json
#	Lighting/Resource/Images.xcassets/shareLogo.imageset/shareLogo.jpeg
#	Lighting/Supporting Files/Images.xcassets/shareLogo.imageset/Contents.json
#	Lighting/Supporting Files/Images.xcassets/shareLogo.imageset/shareLogo.jpeg
#	Podfile.lock
#	Pods/AliyunOSSiOS/AliyunOSSiOS/OSSNetworking.m
#	Pods/Manifest.lock
#	podfile

2、 红包促销拒绝的原因未能显示（在红包展示信息的时候要包含客户姓名及订单总金额）
3、在客户界面的搜索框里，输入客户的手机号或则姓名 要支持模糊查询
4、Ipad端我的红包—更多 点进去之后 显示订单号、时间；增加显示2个字段，客户姓名和订单总额
5、Ipad闯关区—进入之后显示里去掉 结束时间显示
6、邀请人显示 可以点击筛选本门店的设计师，弹框出来可以按照设计师的姓名或则电话号码进行模糊查询,选中后显示在界面上的是设计师的手机号码，ipad客户模块UI重新排版，具体参考邮件psd文件，后台会新建一个接口，获取当前门店下的设计师，根据选择的客户，获取到客户所关联的设计师

# Conflicts:
#	Lighting.xcodeproj/project.pbxproj
#	Lighting/Class/Experiencecentre/Controller/ShoppingBagViewController.m
#	Podfile.lock
#	Pods/JCore/libjcore-ios-1.1.5.a
#	Pods/Manifest.lock
#	Pods/Pods.xcodeproj/project.pbxproj
#	Pods/Target Support Files/IQKeyboardManager/IQKeyboardManager.xcconfig
#	Pods/Target Support Files/Pods-Lighting_base-Lighting/Pods-Lighting_base-Lighting.debug.xcconfig
#	Pods/Target Support Files/Pods-Lighting_base-LightingDev/Pods-Lighting_base-LightingDev.release.xcconfig
#	fastlane/Fastfile
#	podfile