Merge branch 'gin-vue-admin_v2_dev' of G:\QMPlus with conflicts.

This commit is contained in:
pixel
2020-06-01 11:18:13 +08:00
parent 5cb3d7bc86
commit 318f688259
7 changed files with 304 additions and 354 deletions
+4 -4
View File
@@ -2,10 +2,10 @@
package model
import (
"github.com/jinzhu/gorm"
"github.com/jinzhu/gorm"
)
type {{.StructName}} struct {
gorm.Model {{range .Fields}}
{{.FieldName}} {{.FieldType}} `json:"{{.FieldJson}}"{{if .ColumnName}} gorm:"column:{{.ColumnName}}"{{end}}`{{ end }}
}
gorm.Model{{range .Fields}}
{{.FieldName}} {{.FieldType}} `json:"{{.FieldJson}}"{{if .ColumnName}} gorm:"column:{{.ColumnName}}"{{end}}`{{ end }}
}