Merge remote-tracking branch 'origin/dev' into dev
# Conflicts: # template/v4/dto.go.template
This commit is contained in:
commit
c294bb1585
33 files changed
+1014
-83
No files matched your search
@@ -25,5 +25,5 @@ func (e *SysConfig) Generate() models.ActiveRecord {
|
||||
}
|
||||
|
||||
func (e *SysConfig) GetId() interface{} {
|
||||
return e.ID
|
||||
}
|
||||
return e.Id
|
||||
}
|
||||
@@ -33,5 +33,5 @@ func (e *SysLoginLog) Generate() models.ActiveRecord {
|
||||
}
|
||||
|
||||
func (e *SysLoginLog) GetId() interface{} {
|
||||
return e.ID
|
||||
}
|
||||
return e.Id
|
||||
}
|
||||
@@ -41,5 +41,5 @@ func (e *SysOperaLog) Generate() models.ActiveRecord {
|
||||
}
|
||||
|
||||
func (e *SysOperaLog) GetId() interface{} {
|
||||
return e.ID
|
||||
}
|
||||
return e.Id
|
||||
}
|
||||
Reference in new issue
Block a user