提交 6f4d531f 编写于 作者: a303176530's avatar a303176530

Merge branches 'develop', 'gin-vue-admin_v2_dev' and 'master' of...

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
......@@ -13,4 +13,4 @@ type {{.StructName}} struct {
{{- else }}
{{.FieldName}} {{.FieldType}} `json:"{{.FieldJson}}" form:"{{.FieldJson}}" gorm:"column:{{.ColumnName}};comment:'{{.Comment}}'"`
{{- end }} {{- end }}
}
\ No newline at end of file
}
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册