Merge branch 'develop' into feature/app_dev

* develop:
  change shop area rank

go/gopath/src/fohow.com/apps/controllers/order_controller/order_controller.go

@@ -277,7 +277,7 @@ func (self *OrderController) MultShopCreate() {
 	}
 	//非群主店铺专区不能下单
 	wxUser := user_model.GetWxUserByUserId(uId, false)
-	if wxUser.Rank != int64(2) {
+	if wxUser.Rank < int64(2) {
 		self.ReturnError(403, apps.OtherSNotAllow, "", nil)
 	}
 	totalPrice := int64(0)