Merge remote-tracking branch 'origin/master'

attendance-performance-manager-ui/admin/src/components/SearchForm.vue

@@ -160,13 +160,13 @@
           title="查询"
           >查询</el-button
         >
-        <el-button
+        <!-- <el-button
           icon="el-icon-tickets"
           @click="resetTable"
           v-if="visible"
           title="重新汇总"
           >重新汇总</el-button
-        >
+        > -->
 
         <el-button
           icon="el-icon-download"

attendance-performance-manager-ui/admin/src/views/attendance/record/hik/list.vue

@@ -28,14 +28,14 @@
         @click="lookexportHis"
         >导出记录</el-button
       >
-       <el-button
+      <!-- <el-button
         type="primary"
         size="mini"
         slot="table-head-left2"
         style="margin-left: 10px"
         @click="formatData"
         >生成打卡记录</el-button
-      >
+      > -->
     </LayoutTable>
     <dialog-show ref="dialogform" @ok="getData" />
     <el-dialog