同步2
添加图片
Merge branch 'master' of https://github.com/csywind008/ZLZDControl

Conflicts:
	ZLZDControl/CSYSocket.m
	ZLZDControl/PhotoViewController.m