public/go-admin
1
0
Fork 0
mirror of https://github.com/go-admin-team/go-admin.git synced 2026-09-21 02:04:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
# Conflicts:
#	template/v4/dto.go.template
This commit is contained in:
linwenxiang
2021-03-04 23:47:14 +08:00
parent e2952fa393 12be09b4d5
commit c294bb1585
33 changed files with 1014 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files
template/v4/dto.go.template
+3 -3
View File
@@ -2,9 +2,9 @@ package dto
import (
"github.com/gin-gonic/gin"
"gorm.io/gorm"
//"gorm.io/gorm"
"go-admin/app/admin/models"
"go-admin/app/{{.PackageName}}/models"
"go-admin/common/dto"
"go-admin/tools"
"go-admin/pkg/logger"
@@ -72,7 +72,7 @@ func (s *{{.ClassName}}Control) Generate() (*models.{{.ClassName}}, error) {
{{ range .Columns -}}
{{$x := .Pk}}
{{- if ($x) }}
Model: gorm.Model{ID: s.ID},
Model: common.Model{ {{.GoField}}: s.{{.GoField}} },
{{- else if eq .GoField "CreatedAt" -}}
{{- else if eq .GoField "UpdatedAt" -}}
{{- else if eq .GoField "DeletedAt" -}}