From 07fe45d97f14744f4cee6551df8be1ca4833df3d Mon Sep 17 00:00:00 2001
From: lanyi <958600362@qq.com>
Date: 星期二, 29 七月 2025 09:13:21 +0800
Subject: [PATCH] Merge branch 'master' of ssh://115.28.86.8:29418/~admin/天开景运_0405_250719

---
 Server/付林涛/code/tianKai/vcsmainwindow.h |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)

diff --git "a/Server/\344\273\230\346\236\227\346\266\233/code/tianKai/vcsmainwindow.h" "b/Server/\344\273\230\346\236\227\346\266\233/code/tianKai/vcsmainwindow.h"
index a65aa9e..bc61f25 100644
--- "a/Server/\344\273\230\346\236\227\346\266\233/code/tianKai/vcsmainwindow.h"
+++ "b/Server/\344\273\230\346\236\227\346\266\233/code/tianKai/vcsmainwindow.h"
@@ -2,10 +2,13 @@
 #define VCSMAINWINDOW_H
 
 #include <QMainWindow>
+#include <QMessageBox>
+#include <QTimer>
 #include "addfile.h"
 #include "release.h"
 #include "rollback.h"
 #include "readlog.h"
+#include "uploador.h"
 namespace Ui {
 class VCSMainWindow;
 }
@@ -27,12 +30,18 @@
 
     void on_pushButton_3_clicked();
 
+    void addFileSlot(QString, QString);
+
 private:
     Ui::VCSMainWindow *ui;
     AddFile     *m_addFile;
     Release     *m_release;
     RollBack    *m_rollBack;
     ReadLog     *m_readLog;
+    UpLoador    *m_upLoad;
+    QMessageBox *m_msg;
+//    QTimer* m_heartCheckTimer;
+
 };
 
 #endif // VCSMAINWINDOW_H

--
Gitblit v1.8.0