From c5b9ce0c0cf973575a936df3aa928d4b7a7fa7d2 Mon Sep 17 00:00:00 2001
From: xuxiuxi <554325746@qq.com>
Date: 星期五, 08 三月 2019 13:09:26 +0800
Subject: [PATCH] Merge branch 'yw.1.2.fixbug' of http://192.168.1.226:10010/r/development/c++ into yw.1.2.fixbug
---
QiaoJiaSystem/DataManagerServer/vss/model/VssDevTbl.h | 112 ++++++++++++++++++++++++++++----------------------------
1 files changed, 56 insertions(+), 56 deletions(-)
diff --git a/QiaoJiaSystem/DataManagerServer/vss/model/VssDevTbl.h b/QiaoJiaSystem/DataManagerServer/vss/model/VssDevTbl.h
index 0c89637..9dee9ef 100755
--- a/QiaoJiaSystem/DataManagerServer/vss/model/VssDevTbl.h
+++ b/QiaoJiaSystem/DataManagerServer/vss/model/VssDevTbl.h
@@ -1,56 +1,56 @@
-
-#ifndef VSSDEVTBL_H
-#define VSSDEVTBL_H
-#include <mysql++.h>
-#include <string>
-using std::string;
-
-#define VssDevTbl_ID "ID"
-#define VssDevTbl_DevPubID "DevPubID"
-#define VssDevTbl_DevNickname "DevNickname"
-#define VssDevTbl_UserName "UserName"
-#define VssDevTbl_Passwd "Passwd"
-#define VssDevTbl_CorpID "CorpID"
-#define VssDevTbl_IP "IP"
-#define VssDevTbl_Port "Port"
-#define VssDevTbl_Alive "Alive"
-#define VssDevTbl_DMarker "DMarker"
-#define VssDevTbl_UpdateTime "UpdateTime"
-
-/**
- * 鍒涘缓涓�绾ц澶囪〃
- */
-class VssDevTbl {
-public:
- int ID ;
- std::string DevPubID ;
- std::string DevNickname ;
- std::string UserName ;
- std::string Passwd ;
- std::string CorpID ;
- std::string IP ;
- int Port ;
- int Alive ;
- int DMarker ;
- std::string UpdateTime ;
-public:
- /** 鍒涘缓涓�绾ц澶囪〃 鏋勯�犲嚱鏁�*/
- VssDevTbl() {
- ID = 0 ;
- DevPubID = "" ;
- DevNickname = "" ;
- UserName = "" ;
- Passwd = "" ;
- CorpID = "" ;
- IP = "" ;
- Port = 0 ;
- Alive = 0 ;
- DMarker = 0 ;
- UpdateTime = "" ;
- }
-};
-
-
-#endif //VSSDEVTBL_H
-
-
+
+#ifndef VSSDEVTBL_H
+#define VSSDEVTBL_H
+#include <mysql++.h>
+#include <string>
+using std::string;
+
+#define VssDevTbl_ID "ID"
+#define VssDevTbl_DevPubID "DevPubID"
+#define VssDevTbl_DevNickname "DevNickname"
+#define VssDevTbl_UserName "UserName"
+#define VssDevTbl_Passwd "Passwd"
+#define VssDevTbl_CorpID "CorpID"
+#define VssDevTbl_IP "IP"
+#define VssDevTbl_Port "Port"
+#define VssDevTbl_Alive "Alive"
+#define VssDevTbl_DMarker "DMarker"
+#define VssDevTbl_UpdateTime "UpdateTime"
+
+/**
+ * 鍒涘缓涓�绾ц澶囪〃
+ */
+class VssDevTbl {
+public:
+ int ID ;
+ std::string DevPubID ;
+ std::string DevNickname ;
+ std::string UserName ;
+ std::string Passwd ;
+ std::string CorpID ;
+ std::string IP ;
+ int Port ;
+ int Alive ;
+ int DMarker ;
+ std::string UpdateTime ;
+public:
+ /** 鍒涘缓涓�绾ц澶囪〃 鏋勯�犲嚱鏁�*/
+ VssDevTbl() {
+ ID = 0 ;
+ DevPubID = "" ;
+ DevNickname = "" ;
+ UserName = "" ;
+ Passwd = "" ;
+ CorpID = "" ;
+ IP = "" ;
+ Port = 0 ;
+ Alive = 0 ;
+ DMarker = 0 ;
+ UpdateTime = "" ;
+ }
+};
+
+
+#endif //VSSDEVTBL_H
+
+
--
Gitblit v1.8.0