From 31037e4ce8e0f45d4058184d60b358b5eadb50e1 Mon Sep 17 00:00:00 2001
From: congmu <congmu2024@163.com>
Date: 星期三, 06 十一月 2024 15:00:08 +0800
Subject: [PATCH] Merge branch 'master' of ssh://115.28.86.8:29418/~admin/昆仑_1025

---
 Client/姜可庚/code/2024kunlun_project_permisson/qcomboxdelegate.h |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git "a/Client/\345\247\234\345\217\257\345\272\232/code/2024kunlun_project_permisson/qcomboxdelegate.h" "b/Client/\345\247\234\345\217\257\345\272\232/code/2024kunlun_project_permisson/qcomboxdelegate.h"
index d9e575e..5e31c91 100644
--- "a/Client/\345\247\234\345\217\257\345\272\232/code/2024kunlun_project_permisson/qcomboxdelegate.h"
+++ "b/Client/\345\247\234\345\217\257\345\272\232/code/2024kunlun_project_permisson/qcomboxdelegate.h"
@@ -1,12 +1,14 @@
-#ifndef QCOMBOXDELEGATE_H
+锘�#ifndef QCOMBOXDELEGATE_H
 #define QCOMBOXDELEGATE_H
 
 #include <QItemDelegate>
 #include <QComboBox>
-#pragma execution_character_set("utf-8")
+#include <vector>
+using namespace std;
 
 class QComBoxDelegate : public QItemDelegate
 {
+
 public:
     QComBoxDelegate();
     QComBoxDelegate(QObject * p=0);

--
Gitblit v1.8.0