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

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 }} 
-}
+}