1、添加 本地 浏览 图片 。修改公司介绍
Merge branch 'master' of https://github.com/zhwx600/lidaxin-iPhone

Conflicts:
	.DS_Store
	gongsi/GongSiViewController.mm

lidaxin-iPhone.xcodeproj/project.xcworkspace/xcuserdata/apple.xcuserdata
d/UserInterfaceState.xcuserstate

lidaxin-iPhone.xcodeproj/xcuserdata/apple.xcuserdatad/xcdebugger/Breakpo
ints.xcbkptlist
543435
999