货代端订单详情。
我的货源的货源详情界面。
Merge branch 'official' of https://github.com/txfan/smart-logistics.git
into official

Conflicts:
	android/FreightApp/FreightApp_DaoGenerator/bin/de/greenrobot/daogenerator/gentest/Car.class
	android/FreightApp/FreightApp_DaoGenerator/src/de/greenrobot/daogenerator/gentest/Car.java
	android/FreightApp/gen/com/freightapp/activity/R.java
	android/FreightApp/gen/com/wisdomcity/uicomp/R.java
	android/FreightApp/src-gen/com/freightapp/activity/Car.java
	android/FreightApp/src-gen/com/freightapp/activity/CarDao.java
	android/FreightApp/src/com/freightapp/fragments/PublicTransportforceFragment.java