推合并解决冲突

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

@@ -226,7 +226,7 @@ export default {
       this.$forceUpdate();
     },
     beforeRender(row) {
-      this.tableData.dict=row.dict;
+      this.tableData.dict = row.dict;
       row.data.forEach((element) => {
         if (
           element.attendanceStaffStatEntities &&
@@ -255,7 +255,6 @@ export default {
                           {(v.goWorkDate = timestampToTime(v.goWorkDate, 6))}
                           {"  "} 打卡结果：
                           {this.tableData.dict.goWorkResult[v.goWorkResult]}
-
                         </span>
                       )}
                       {v.offWorkResult == 1 ? (
@@ -263,7 +262,6 @@ export default {
                           打卡时间：
                           {(v.offWorkDate = timestampToTime(v.offWorkDate, 6))}
                           {"  "} 打卡结果：
-
                           {this.tableData.dict.offWorkResult[v.offWorkResult]}
                         </span>
                       ) : (