# Conflicts:
#	GeliBusinessPlatform.xcworkspace/xcuserdata/junyelu.xcuserdatad/UserInterfaceState.xcuserstate
#	GeliBusinessPlatform.xcworkspace/xcuserdata/liujunhong.xcuserdatad/UserInterfaceState.xcuserstate
#	GeliBusinessPlatform/ViewController/代客下单（货运）/下运单/XiaYunDanViewController.swift