Merge branch 'develop' into feature/app_dev

* develop:
  dept message

# Conflicts:
#	go/gopath/src/fohow.com/apps/controllers/pay_controller/pay_exchange_controller.go

go/gopath/src/fohow.com/apps/controllers/pay_controller/pay_exchange_controller.go

@@ -43,7 +43,7 @@ func (self *PayController) payExchange(oId, payWay, tradPwd, returnUrl, source,
 	var concat string
 	var tel string
 	var addr string
-	pick_dept_id, _ := self.GetInt64("pick_dept_id")
+	pick_dept_id, _ := self.GetInt64("pick_dept")
 	pick_way, _ := self.GetInt64("pick_way")
 	if pick_way == order_model.PICK_EXPRESS {
 		//地址