Merge remote-tracking branch 'origin/develop' into develop

src/pages/localTool/standardRecognition/index.vue

@@ -23,7 +23,6 @@
           style="width: 100%"
           height="100%"
           @selection-change="standSelectChange"
-          @sort-change="sortChange"
           :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }"
         >
           <el-table-column type="selection" align="center" width="50">
@@ -100,7 +99,6 @@
             prop="spendTime"
             label="消耗时间(秒)"
             align="center"
-            sortable="custom"
             width="140"
           >
           </el-table-column>