Merge remote-tracking branch 'origin/dev' into dev

# Conflicts:
#	template/v4/dto.go.template
This commit is contained in:
linwenxiang committed 2021-03-04 23:47:14 +08:00
commit c294bb1585
33 files changed
+1014 -83

No files matched your search

+2 -2
View File
@@ -25,5 +25,5 @@ func (e *SysConfig) Generate() models.ActiveRecord {
}
func (e *SysConfig) GetId() interface{} {
return e.ID
}
return e.Id
}
+2 -2
View File
@@ -33,5 +33,5 @@ func (e *SysLoginLog) Generate() models.ActiveRecord {
}
func (e *SysLoginLog) GetId() interface{} {
return e.ID
}
return e.Id
}
+2 -2
View File
@@ -41,5 +41,5 @@ func (e *SysOperaLog) Generate() models.ActiveRecord {
}
func (e *SysOperaLog) GetId() interface{} {
return e.ID
}
return e.Id
}