From 2303163f4c0109057af678ca49428653ee8c6dfd Mon Sep 17 00:00:00 2001
From: wangky <m1561510467@163.com>
Date: 星期四, 31 十月 2024 15:27:55 +0800
Subject: [PATCH] Merge branch 'master' of ssh://115.28.86.8:29418/~admin/昆仑_1025

---
 Client/姜可庚/code/2024kunlun_project_permisson/permissonwindow.cpp |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git "a/Client/\345\247\234\345\217\257\345\272\232/code/2024kunlun_project_permisson/permissonwindow.cpp" "b/Client/\345\247\234\345\217\257\345\272\232/code/2024kunlun_project_permisson/permissonwindow.cpp"
index 7ba0016..cd23094 100644
--- "a/Client/\345\247\234\345\217\257\345\272\232/code/2024kunlun_project_permisson/permissonwindow.cpp"
+++ "b/Client/\345\247\234\345\217\257\345\272\232/code/2024kunlun_project_permisson/permissonwindow.cpp"
@@ -11,7 +11,7 @@
     ui(new Ui::PermissonWindow)
 {
     ui->setupUi(this);
-    clientSocket = new PmsClientSocket;
+    clientSocket = new PmsClientSocket(this);
 
     dia = new PermissonDialog(this,clientSocket);
 

--
Gitblit v1.8.0