8.26 8:52 miao

1.宠物资料页面修改
Merge branch 'dev' of https://github.com/miaocuilin/MyPetty2 into miao-dev

Conflicts:
	MyPetty.xcodeproj/project.pbxproj
	MyPetty/AppDelegate.m
	ViewControllers/基类/BottomMenuRootViewController.m
Merge branch 'miao-dev' into dev

Conflicts:
MyPetty.xcodeproj/project.pbxproj
MyPetty/AppDelegate.m
ViewControllers/基类/BottomMenuRootViewController.m
1