添加nslog
no message
no message
Merge branch 'develop'

Conflicts:
	EasyD.xcworkspace/xcuserdata/Gg294635.xcuserdatad/UserInterfaceState.xcuserstate