# Conflicts:
#	PhoneManager/Class/Page/Contact/View/Common/AlertView/BaseAlertView.swift
#	PhoneManager/Class/Page/Home/Controller/PhotoSlideViewController.swift
#	PhoneManager/Class/Page/Home/View/AnchorRotatableView.swift
#	PhoneManager/Class/Page/Secret/PMShowImgVideoController.swift
#	PhoneManager/Class/Page/Widget/View/WidgetBornThenView.swift

* develop_0409:
  邮箱界面

* develop_0409:
  【优化】部分代码优化
  【优化】1、优化流程，修改
  【新增】联系人主要功能逻辑代码
  【新增】添加重复联系人点击逻辑
  【修改】修改压缩方法

* 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