* 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