Merge branch 'master' of http://git.taauav.net/gitadmin/jndz_admin_web

src/views/basicTable/category.vue

@@ -58,12 +58,6 @@
           align="center"
           prop="createTime"
         ></el-table-column>
-        <el-table-column
-          label="创建人"
-          min-width="80"
-          align="center"
-          prop="createUser"
-        ></el-table-column>
         <el-table-column label="操作" min-width="120" align="center">
           <template slot-scope="{ row }">
             <el-link

src/views/login/login.vue

@@ -33,7 +33,7 @@ export default {
   data() {
     return {
       loading: false,  // 加载状态
-      form: {username: 'admin', password: '123456', captcha: '520', remember: true, key:''},  // 表单数据
+      form: {username: '', password: '', captcha: '', remember: true, key:''},  // 表单数据
       rules: {  // 表单验证规则
         username: [
           {required: true, message: '请输入账号', trigger: 'blur'}