Merge branch 'viettel-ffm' into develop
This commit is contained in:
		
						commit
						570cf7b8f1
					
				| 
						 | 
					@ -33,7 +33,7 @@ type ORPayload struct {
 | 
				
			||||||
	CustomerEmail  string          `json:"customer_email"`
 | 
						CustomerEmail  string          `json:"customer_email"`
 | 
				
			||||||
	PackType       string          `json:"pack_type"`
 | 
						PackType       string          `json:"pack_type"`
 | 
				
			||||||
	PriorityType   string          `json:"priority_type"`
 | 
						PriorityType   string          `json:"priority_type"`
 | 
				
			||||||
	Warehouse      ORWarehouse     `json:"warehouse"`
 | 
						WarehouseCode  string          `json:"warehouse_code"`
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
type ORProductLine struct {
 | 
					type ORProductLine struct {
 | 
				
			||||||
| 
						 | 
					@ -58,10 +58,6 @@ type ProdCondType struct {
 | 
				
			||||||
	Name string `json:"name"`
 | 
						Name string `json:"name"`
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
type ORWarehouse struct {
 | 
					 | 
				
			||||||
	WarehouseId int `json:"warehouse_id"`
 | 
					 | 
				
			||||||
}
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
type ORResult struct {
 | 
					type ORResult struct {
 | 
				
			||||||
	OrCode string `json:"or_code"`
 | 
						OrCode string `json:"or_code"`
 | 
				
			||||||
	OrId   int    `json:"or_id"`
 | 
						OrId   int    `json:"or_id"`
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue