From 3143aab798b6ea93a472a6b32f69a6aabc7da04e Mon Sep 17 00:00:00 2001
From: pansen <pansen626@sina.com>
Date: 星期五, 08 三月 2019 16:28:25 +0800
Subject: [PATCH] Merge branch 'yw.1.2.fixbug' of ssh://192.168.1.226:29418/development/c++ into yw.1.2
---
QiaoJiaSystem/VideoServer/QiaoJia/DB/DBStruct.h | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/QiaoJiaSystem/VideoServer/QiaoJia/DB/DBStruct.h b/QiaoJiaSystem/VideoServer/QiaoJia/DB/DBStruct.h
index 0ae7935..44e7822 100644
--- a/QiaoJiaSystem/VideoServer/QiaoJia/DB/DBStruct.h
+++ b/QiaoJiaSystem/VideoServer/QiaoJia/DB/DBStruct.h
@@ -61,6 +61,7 @@
str_brand = "";
str_reserved = "";
n_type = -1;
+ type = -1;
}
int n_id;//鑷id
@@ -76,6 +77,7 @@
QString str_brand;//鎽勫儚鏈哄搧鐗�
QString str_reserved;//棰勭暀
int n_type;//棰勭暀
+ int type;// 0 rtsp, 1 gb28181
};
struct Record_Cam_Chn {
--
Gitblit v1.8.0