Merge branch 'main' of http://47.107.152.87:3000/dyf/dyf-vue-ui

# Conflicts: # .env.development
2025-09-22 10:33:06 +08:00
parent dbf39c5538 b1f5cfdd7a
commit 2d005a5456
10 changed files with 188 additions and 56 deletions
--- a/src/api/equipmentAlarmRecord/types.ts
+++ b/src/api/equipmentAlarmRecord/types.ts
@ -16,6 +16,7 @@ export interface AlarmVO {
  deviceMac: string;
  devicePic:string;
  finishTime: string;
+  timeDiff:string
  
 }