Merge branch 'viettel-ffm' into develop

partnerapi/viettelffm/model.go

@@ -33,7 +33,7 @@ type ORPayload struct {
 	CustomerEmail  string          `json:"customer_email"`
 	PackType       string          `json:"pack_type"`
 	PriorityType   string          `json:"priority_type"`
-	Warehouse      ORWarehouse     `json:"warehouse"`
+	WarehouseCode  string          `json:"warehouse_code"`
 }
 
 type ORProductLine struct {
@@ -58,10 +58,6 @@ type ProdCondType struct {
 	Name string `json:"name"`
 }
 
-type ORWarehouse struct {
-	WarehouseId int `json:"warehouse_id"`
-}
-
 type ORResult struct {
 	OrCode string `json:"or_code"`
 	OrId   int    `json:"or_id"`