diff --git a/app/admin/models/sys_dict_data.go b/app/admin/models/sys_dict_data.go index 2108c17..4a01373 100644 --- a/app/admin/models/sys_dict_data.go +++ b/app/admin/models/sys_dict_data.go @@ -5,9 +5,6 @@ import ( ) type SysDictData struct { - models.ControlBy - models.ModelTime - DictCode int `json:"dictCode" gorm:"primaryKey;column:dict_code;autoIncrement;comment:主键编码"` DictSort int `json:"dictSort" gorm:"size:20;comment:DictSort"` DictLabel string `json:"dictLabel" gorm:"size:128;comment:DictLabel"` @@ -19,6 +16,8 @@ type SysDictData struct { Status string `json:"status" gorm:"size:4;comment:Status"` Default string `json:"default" gorm:"size:8;comment:Default"` Remark string `json:"remark" gorm:"size:255;comment:Remark"` + models.ControlBy + models.ModelTime } func (SysDictData) TableName() string { diff --git a/app/admin/models/sys_dict_type.go b/app/admin/models/sys_dict_type.go index 735cb87..29442bd 100644 --- a/app/admin/models/sys_dict_type.go +++ b/app/admin/models/sys_dict_type.go @@ -5,14 +5,13 @@ import ( ) type SysDictType struct { - models.ControlBy - models.ModelTime - ID int `json:"id" gorm:"primaryKey;column:dict_id;autoIncrement;comment:主键编码"` DictName string `json:"dictName" gorm:"size:128;comment:DictName"` DictType string `json:"dictType" gorm:"size:128;comment:DictType"` Status string `json:"status" gorm:"size:4;comment:Status"` Remark string `json:"remark" gorm:"size:255;comment:Remark"` + models.ControlBy + models.ModelTime } func (SysDictType) TableName() string { diff --git a/app/admin/models/sys_user.go b/app/admin/models/sys_user.go index 614dbb7..e239b29 100644 --- a/app/admin/models/sys_user.go +++ b/app/admin/models/sys_user.go @@ -7,8 +7,6 @@ import ( ) type SysUser struct { - models.ControlBy - models.ModelTime UserId int `gorm:"primaryKey;autoIncrement;comment:编码" json:"userId"` Username string `json:"username" gorm:"size:64;comment:用户名"` Password string `json:"-" gorm:"size:128;comment:密码"` @@ -27,6 +25,8 @@ type SysUser struct { PostIds []int `json:"postIds" gorm:"-"` RoleIds []int `json:"roleIds" gorm:"-"` Dept *SysDept `json:"dept"` + models.ControlBy + models.ModelTime } func (SysUser) TableName() string { diff --git a/cmd/migrate/migration/models/system.go b/cmd/migrate/migration/models/system.go deleted file mode 100644 index b0498c3..0000000 --- a/cmd/migrate/migration/models/system.go +++ /dev/null @@ -1,12 +0,0 @@ -package models - -type SysSetting struct { - SettingsId int `json:"settings_id" gorm:"primary_key;AUTO_INCREMENT"` - Name string `json:"name" gorm:"type:varchar(256);"` - Logo string `json:"logo" gorm:"type:varchar(256);"` - ModelTime -} - -func (SysSetting) TableName() string { - return "sys_setting" -}