From 9ae4eeb33fe6dda70e4c24e483378abc60ebdc0d Mon Sep 17 00:00:00 2001 From: valitovgaziz Date: Wed, 11 Feb 2026 06:46:16 +0500 Subject: [PATCH] modified: main_dc/yalarba/api_yal/internal/models/base.go modified: "main_dc/yalarba/api_yal/internal/models/\320\276bject.go" delete UpdateHistory from base struct --- main_dc/yalarba/api_yal/internal/models/base.go | 1 - main_dc/yalarba/api_yal/internal/models/оbject.go | 7 ++++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/main_dc/yalarba/api_yal/internal/models/base.go b/main_dc/yalarba/api_yal/internal/models/base.go index 568017d..c2aee34 100644 --- a/main_dc/yalarba/api_yal/internal/models/base.go +++ b/main_dc/yalarba/api_yal/internal/models/base.go @@ -10,5 +10,4 @@ type Base struct { CreatedAt time.Time `json:"created_at,omitempty"` UpdatedAt time.Time `json:"updated_at,omitempty"` DeletedAt gorm.DeletedAt `gorm:"index" json:"-"` - UpdateHistories []UpdateHistory `gorm:"polymorphic:Model" json:"-"` } diff --git a/main_dc/yalarba/api_yal/internal/models/оbject.go b/main_dc/yalarba/api_yal/internal/models/оbject.go index 62fef25..c4711af 100644 --- a/main_dc/yalarba/api_yal/internal/models/оbject.go +++ b/main_dc/yalarba/api_yal/internal/models/оbject.go @@ -7,11 +7,12 @@ type Object struct { Base Base `gorm:"embedded"` // owner account ID - Owner Account `gorm:"foreignKey:OwnerID" json:"owner"` + Owner Account `gorm:"foreignKey:OwnerID" json:"owner"` + AccountID uint `gorm:"not null" json:"account_id"` // Основная информация - Short_Name string `gorm:"not null" json:"name"` - Long_Name string `json:"long_name"` + ShortName string `gorm:"not null" json:"short_name"` + LongName string `json:"long_name"` Type string `json:"type"` Phone string `json:"phone"` Email string `json:"email"`