解决冲突

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

@@ -109,7 +109,6 @@ 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)