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

# Conflicts:
#	server/resource/template/te/model.go.tpl

server/resource/template/te/model.go.tpl

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

web/src/view/superAdmin/menu/icon.vue

@@ -2,8 +2,6 @@
   <div>
     <el-form
       :inline="true"
-      :model="form"
-      :rules="rules"
       label-width="85px"
       ref="menuForm"
       label-position="top"

web/src/view/superAdmin/menu/menu.vue

@@ -60,7 +60,6 @@
             路由path
             <el-checkbox style="float:right;margin-left:20px;" v-model="checkFlag">添加参数</el-checkbox>
           </div>
-          
           <el-input
             :disabled="!checkFlag"
             autocomplete="off"