From a99b5cd264e65bf27f8759502cd01c976ddf995e Mon Sep 17 00:00:00 2001
From: jiangkegeng <jiangkegeng>
Date: 星期四, 07 十一月 2024 15:43:31 +0800
Subject: [PATCH] Merge branch 'master' of ssh://115.28.86.8:29418/~admin/昆仑_1025
---
Client/姜可庚/code/2024kunlun_project_permisson/permissonwindow.h | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git "a/Client/\345\247\234\345\217\257\345\272\232/code/2024kunlun_project_permisson/permissonwindow.h" "b/Client/\345\247\234\345\217\257\345\272\232/code/2024kunlun_project_permisson/permissonwindow.h"
index aeb776b..d0e8f30 100644
--- "a/Client/\345\247\234\345\217\257\345\272\232/code/2024kunlun_project_permisson/permissonwindow.h"
+++ "b/Client/\345\247\234\345\217\257\345\272\232/code/2024kunlun_project_permisson/permissonwindow.h"
@@ -10,6 +10,8 @@
#include "syncdatatodb.h"
#include "PmsClientSocket.h"
+#include <QMessageBox>
+
using namespace std;
@@ -44,11 +46,13 @@
QMenu * m;
PermissonDialog *dia;
SyncDataToDB * dbInfo;
- map<string,int> roleMap;
+
vector<PmsQueryResult> globalPms;
PmsClientSocket * clientSocket;
+ bool isRenderData;
+
};
--
Gitblit v1.8.0