Merge branch 'master' of ssh://115.28.86.8:29418/~admin/昆仑_1025

小驴在此and

2024-11-07 a2a845c7ca4ba4aa08fde7f63d5b24975bcd294c

 Client/姜可庚/code/2024kunlun_project_permisson/permissonwindow.h

@@ -46,11 +46,13 @@
    QMenu * m;
    PermissonDialog *dia;
    SyncDataToDB * dbInfo;
    map<string,int> roleMap;


    vector<PmsQueryResult> globalPms;
    PmsClientSocket * clientSocket;

    bool isRenderData;


};