Merge branch 'feature/app_dev' of http://git.hiwavo.com/Fohow/fohow_api into feature/app_dev

# Conflicts:
#	go/gopath/src/fohow.com/apps/models/order_model/order.go
#	go/gopath/src/fohow.com/apps/models/order_model/order_detail.go

go/gopath/src/fohow.com/apps/models/order_model/order.go

@@ -109,6 +109,7 @@ type Order struct {
 	Freight        int64              `orm:"column(freight);null"                            json:"freight"`              // int(11)
 	Depart         int64              `orm:"column(depart)" json:"-"`                                                     // datetime
 	Pv             int64              `orm:"column(pv)"            json:"pv"`                                             // varchar(255)
+	Pv             int64              `orm:"column(pv)"             json:"pv"`                                            // varchar(255)
 	DispatchTime   time.Time          `orm:"column(dispatch_time);null;type(datetime)"           json:"dispatch_time"`
 	ReceiveTime    time.Time          `orm:"column(receive_time);null;type(datetime)"            json:"receive_time"`
 	PaiedTime      time.Time          `orm:"column(paied_time);null;type(datetime)"              json:"paied_time"` // int(11)

go/gopath/src/fohow.com/nginx/ngx_prod_config

@@ -14,6 +14,11 @@ server {
       #expires  30d;
     }
 
+    location =/apple-app-site-association {
+          root /home/www/fohow/api/go/gopath/src/fohow.com/static/api/;
+          #expires  30d;
+        }
+
     location =/stcXSY70Qh.txt {
       root /home/www/fohow/api/go/gopath/src/fohow.com/static/api/;
     }