* contact:
  联系人不完整联系人
  联系人
  联系人代码

# Conflicts:
#	PhoneManager/Assets.xcassets/Charge/img_bj_battery 1.imageset/Contents.json
#	PhoneManager/Assets.xcassets/Charge/img_bj_battery 1.imageset/img_bj_battery.png
#	PhoneManager/Assets.xcassets/Charge/img_bj_battery 1.imageset/img_bj_battery@2x.png
#	PhoneManager/Assets.xcassets/Charge/img_bj_battery 1.imageset/img_bj_battery@3x.png
#	PhoneManager/Assets.xcassets/Charge/img_bj_battery_default.imageset/Contents.json
#	PhoneManager/Assets.xcassets/Charge/img_bj_battery_default.imageset/img_bj_battery.png
#	PhoneManager/Assets.xcassets/Charge/img_bj_battery_default.imageset/img_bj_battery@2x.png
#	PhoneManager/Assets.xcassets/Charge/img_bj_battery_default.imageset/img_bj_battery@3x.png
#	PhoneManager/Assets.xcassets/Contact/btn_add_contact.imageset/btn_add_contact.png
#	PhoneManager/Assets.xcassets/Contact/btn_add_contact.imageset/btn_add_contact@2x.png
#	PhoneManager/Assets.xcassets/Contact/btn_add_contact.imageset/btn_add_contact@3x.png
#	PhoneManager/Assets.xcassets/img_bj_battery.imageset/Contents.json
#	PhoneManager/Assets.xcassets/img_bj_battery.imageset/img_bj_battery.png
#	PhoneManager/Assets.xcassets/img_bj_battery.imageset/img_bj_battery@2x.png
#	PhoneManager/Assets.xcassets/img_bj_battery.imageset/img_bj_battery@3x.png
#	PhoneManager/Class/Session/Home/Controller/HomeViewController.swift
#	PhoneManager/Class/Session/Home/Model/TabbarImtesData.json

# Conflicts:
#	PhoneManager/Class/Session/Home/Controller/HomeInfoViewController.swift

Merge branch 'Advertisement' of http://gitlab.zhangxindiet.com/ShuMing/phonemanager into Advertisement

* 'Advertisement' of http://gitlab.zhangxindiet.com/ShuMing/phonemanager:
  fix bugs

Merge branch 'Advertisement' of http://gitlab.zhangxindiet.com/ShuMing/phonemanager into Advertisement

* 'Advertisement' of http://gitlab.zhangxindiet.com/ShuMing/phonemanager:
  fix bug

Merge branch 'Advertisement' of http://gitlab.zhangxindiet.com/ShuMing/phonemanager into Advertisement

* 'Advertisement' of http://gitlab.zhangxindiet.com/ShuMing/phonemanager:
  权限页面

Merge branch 'Advertisement' of http://gitlab.zhangxindiet.com/ShuMing/phonemanager into Advertisement

* 'Advertisement' of http://gitlab.zhangxindiet.com/ShuMing/phonemanager:
  优化ui,内购处理

# Conflicts:
#	PhoneManager/Class/Tool/Class/PhotoAndVideoMananger/PhotoAndVideoMananger.swift

Merge branch 'Advertisement' of http://gitlab.zhangxindiet.com/ShuMing/phonemanager into Advertisement

* 'Advertisement' of http://gitlab.zhangxindiet.com/ShuMing/phonemanager:
  1.启动页修改  2.适配修改

1、跳转问题
2、缓存问题
3、首页UI问题
4、磁盘占用空间更改

Merge branch 'Advertisement' of http://gitlab.zhangxindiet.com/ShuMing/phonemanager into Advertisement

* 'Advertisement' of http://gitlab.zhangxindiet.com/ShuMing/phonemanager:
  fix bugs
  取消删除照片动画立即小时处理
  1.删除加载动画 2.启动页面重制完成 3.UI适配修复 4.通知功能完善

2.启动页面重制完成
3.UI适配修复
4.通知功能完善

2、充电流程更新
3、添加获取内购价格缓存

# Conflicts:
#	PhoneManager/Class/Session/Home/Controller/HomeInfoViewController.swift

2.功能引导页完成
3.本地通知功能
4.自定义评价弹窗
5.删除完成庆祝页

1、修复删除相似或者重复图片BUG
2、修改提示框图片和文字间距
3、默认页面添加文字
4、修改首页不显示实时数量问题