From 4d1c2ee860222138fc7932225ea6d91e7483646a Mon Sep 17 00:00:00 2001
From: pansen <pansen626@sina.com>
Date: 星期一, 22 四月 2019 11:18:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.3nsq' into 1.3nsq
---
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 44e7822..5f7aa3a 100644
--- a/QiaoJiaSystem/VideoServer/QiaoJia/DB/DBStruct.h
+++ b/QiaoJiaSystem/VideoServer/QiaoJia/DB/DBStruct.h
@@ -299,6 +299,7 @@
strExAreas = "";
strLine = "";
strAddr = "";
+ strPerimeterObjType = "";
}
int nSdkType;
@@ -318,6 +319,7 @@
int nAlarmNumUpperLimit; //鎶ヨ浜烘暟锛堜汉鍛樻嫢鎸わ級
int nAlarmNumLowerLimit;
int nIsRun;
+ QString strPerimeterObjType;//鍏ヤ镜绫诲瀷
std::vector<LActRuleWeekRecord> weekRuleVec;
};
--
Gitblit v1.8.0