Merge branch 'dev' of github.com:go-admin-team/go-admin into dev
This commit is contained in:
commit
52f45e362b
26 files changed
+526
-4336
No files matched your search
@@ -11,8 +11,8 @@ type SysRole struct {
|
||||
Admin bool `json:"admin" gorm:"size:4;"`
|
||||
DataScope string `json:"dataScope" gorm:"size:128;"`
|
||||
SysMenu []SysMenu `json:"sysMenu" gorm:"many2many:sys_role_menu;foreignKey:RoleId;joinForeignKey:role_id;references:MenuId;joinReferences:menu_id;"`
|
||||
ModelTime
|
||||
ControlBy
|
||||
ModelTime
|
||||
}
|
||||
|
||||
func (SysRole) TableName() string {
|
||||
|
||||
@@ -40,6 +40,7 @@ func _1599190683659Tables(db *gorm.DB, version string) error {
|
||||
new(models.SysCategory),
|
||||
new(models.SysContent),
|
||||
new(models.SysApi),
|
||||
new(models.SysChinaAreaData),
|
||||
)
|
||||
if err != nil {
|
||||
return err
|
||||
@@ -47,4 +48,4 @@ func _1599190683659Tables(db *gorm.DB, version string) error {
|
||||
return db.Create(&common.Migration{
|
||||
Version: version,
|
||||
}).Error
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user