Merge 'dev' into 'main'

2022-10-03 16:56:47 +03:00
parent 6271fa6d45
commit 5fd450382c
400 changed files with 14394 additions and 13407 deletions
--- a/pkg/cloudapi/locations/models.go
+++ b/pkg/cloudapi/locations/models.go
@@ -1,14 +1,14 @@
-package locations
-
-type Location struct {
-	GID          int           `json:"gid"`
-	Id           int           `json:"id"`
-	Guid         int           `json:"guid"`
-	LocationCode string        `json:"locationCode"`
-	Name         string        `json:"name"`
-	Flag         string        `json:"flag"`
-	Meta         []interface{} `json:"_meta"`
-	CKey         string        `json:"_ckey"`
-}
-
-type LocationsList []Location
+package locations
+
+type Location struct {
+	GID          uint64        `json:"gid"`
+	ID           uint64        `json:"id"`
+	GUID         uint64        `json:"guid"`
+	LocationCode string        `json:"locationCode"`
+	Name         string        `json:"name"`
+	Flag         string        `json:"flag"`
+	Meta         []interface{} `json:"_meta"`
+	CKey         string        `json:"_ckey"`
+}
+
+type LocationsList []Location