From 59fcc48c8589b9df2af744fd6c77854061a52f54 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期一, 16 十月 2023 10:07:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ard-work/src/main/java/com/ruoyi/device/hiksdk/common/GlobalVariable.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/device/hiksdk/common/GlobalVariable.java b/ard-work/src/main/java/com/ruoyi/device/hiksdk/common/GlobalVariable.java
index 2fd88fc..928dafb 100644
--- a/ard-work/src/main/java/com/ruoyi/device/hiksdk/common/GlobalVariable.java
+++ b/ard-work/src/main/java/com/ruoyi/device/hiksdk/common/GlobalVariable.java
@@ -1,8 +1,6 @@
package com.ruoyi.device.hiksdk.common;
-import com.ruoyi.device.hiksdk.domain.recordInfo;
import lombok.Data;
-
import java.util.HashMap;
import java.util.Map;
@@ -16,7 +14,9 @@
@Data
public class GlobalVariable {
//淇濆瓨鐩告満鐧诲綍淇℃伅
- public static Map<String, Integer> loginMap = new HashMap<>();
- //淇濆瓨褰曞儚淇℃伅
- public static Map<Integer, recordInfo> user_real_Map = new HashMap<>();
+ public static Map<String, Object> loginMap = new HashMap<>();
+ //鐩告満棰勮瀛楀吀
+ public static Map<String, Integer> previewMap = new HashMap<>();
+ //绾跨▼瀛楀吀
+ public static Map<String,String>threadMap=new HashMap<>();
}
--
Gitblit v1.9.3