店铺设置页面修改
Merge branch 'modelDevelop'
新增订单管理
Merge branch 'modelDevelop'
uploading headImage

uploading headImageView,did not uploading to server.
我的订单数据修改
Merge remote-tracking branch 'origin/Alice_Dev'
Merge branch 'modelDevelop'
订单管理部分修改
Merge branch 'modelDevelop'
modify mymerchant interface name