周边城市货源列表功能，正在调试返回按钮功能。
jar
包
周边货源-周边城市货源列表功能完成。
Merge branch 'my_branche' into official

Conflicts:
	android/WisdomCity/DaoExampleGenerator/src/de/greenrobot/daogenerator/gentest/ExampleDaoGenerator.java
	android/WisdomCity/src-gen/com/softstone/wisdomcity/dao/DaoMaster.java
	android/WisdomCity/src-gen/com/softstone/wisdomcity/dao/DaoSession.java
	android/WisdomCity/src/com/softstone/wisdomcity/WisdomCityMainActivity.java
	android/WisdomCity/src/com/softstone/wisdomcity/fragments/CityGoodsListFragment.java
	android/WisdomCity/src/com/softstone/wisdomcity/fragments/RimFragment.java
	android/WisdomCity/src/com/softstone/wisdomcity/models/RimGoodsListModel.java
	android/WisdomCity/src/com/softstone/wisdomcity/models/net/apis/RimCityGoodsListAPI.java
	合并成功周边货源-周边城市货源列表功能