Merge branches 'develop', 'gin-vue-admin_v2_dev' and 'master' of https://github.com/flipped-aurora/gin-vue-admin into develop

QM303176530 · QM303176530 · commit 6f4d531f8523 · 2020-06-24T21:57:10.000+08:00
� Conflicts:
�	server/resource/template/te/model.go.tpl
diff --git a/server/resource/template/te/model.go.tpl b/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 }} 
-}
+}
