Merge remote-tracking branch 'origin/gin-vue-admin_v2_dev' into gin-vue-admin_v2_dev

# Conflicts:
#	server/resource/template/te/model.go.tpl
This commit is contained in:
pixel
2020-06-01 11:18:45 +08:00
3 changed files with 2 additions and 5 deletions
+2 -2
View File
@@ -6,6 +6,6 @@ import (
)
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}}" form:"{{.FieldJson}}" {{if .ColumnName}} gorm:"column:{{.ColumnName}}"{{end}}`{{ end }}
}