Merge remote-tracking branch 'origin/master'

zhaowei

7 天以前 008245cbe95c63a80f9a255378a5ffbe25d15085

 src/views/system/SysPositionList.vue

@@ -15,7 +15,7 @@
            <a-form-item label="岗位名称">
              <j-input placeholder="请输入岗位名称" v-model="queryParam.name"></j-input>
            </a-form-item>
          </a-col>
          </a-col
          <a-col :md="6" :sm="8">
            <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
              <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
@@ -128,6 +128,11 @@
          align: 'center',
          dataIndex: 'name'
        },
        {
          title: '备注',
          align: 'center',
          dataIndex: 'remark'
        },
        // {
        //   title: '职级',
        //   align: 'center',