Merge branches 'develop', 'gin-vue-admin_v2_dev' and 'master' of https://github.com/flipped-aurora/gin-vue-admin into develop
Conflicts: server/resource/template/te/model.go.tpl
This commit is contained in:
commit
472e5039fb
|
@ -13,4 +13,4 @@ type {{.StructName}} struct {
|
||||||
{{- else }}
|
{{- else }}
|
||||||
{{.FieldName}} {{.FieldType}} `json:"{{.FieldJson}}" form:"{{.FieldJson}}" gorm:"column:{{.ColumnName}};comment:'{{.Comment}}'"`
|
{{.FieldName}} {{.FieldType}} `json:"{{.FieldJson}}" form:"{{.FieldJson}}" gorm:"column:{{.ColumnName}};comment:'{{.Comment}}'"`
|
||||||
{{- end }} {{- end }}
|
{{- end }} {{- end }}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue