Merge pull request #802 from zhanluxianshen/drop-base-model

replace basemodel by common.model
go-admin-team · Aug 29, 2024 · bedf064 · bedf064
2 parents 9a8e0cd + 5dde1d2
commit bedf064
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 17 deletions.
diff --git a/app/admin/models/model.go b/app/admin/models/model.go
diff --git a/app/other/models/tools/sys_columns.go b/app/other/models/tools/sys_columns.go
@@ -1,7 +1,8 @@
 package tools
 
 import (
-	"go-admin/app/admin/models"
+	common "go-admin/common/models"
+
 	"gorm.io/gorm"
 )
 
@@ -44,7 +45,7 @@ type SysColumns struct {
 	CreateBy           int          `gorm:"column:create_by;size:20;" json:"createBy"`
 	UpdateBy           int          `gorm:"column:update_By;size:20;" json:"updateBy"`
 
-	models.BaseModel
+	common.ModelTime
 }
 
 func (*SysColumns) TableName() string {

diff --git a/app/other/models/tools/sys_tables.go b/app/other/models/tools/sys_tables.go
@@ -5,8 +5,6 @@ import (
 	"strings"
 
 	"gorm.io/gorm"
-
-	"go-admin/app/admin/models"
 )
 
 type SysTables struct {
@@ -43,8 +41,6 @@ type SysTables struct {
 	DataScope string       `gorm:"-" json:"dataScope"`
 	Params    Params       `gorm:"-" json:"params"`
 	Columns   []SysColumns `gorm:"-" json:"columns"`
-
-	models.BaseModel
 }
 
 func (*SysTables) TableName() string {