Merge branch 'dev' into 'master'

修改类型

See merge request !48

src/views/home/navMenu.vue

@@ -111,6 +111,7 @@
         </el-form-item>
         <el-form-item label="密码">
           <el-input
+            type="password"
             placeholder="请输入密码"
             v-model="editForm.password"></el-input>
         </el-form-item>