From 53630c440d592792dcdd86f8d5b2c59da4f3c359 Mon Sep 17 00:00:00 2001
From: pans <pansen626@sina.com>
Date: 星期一, 28 一月 2019 20:35:35 +0800
Subject: [PATCH] Merge branch 'ywv1.2' into ywv1.2_布控feature
---
QiaoJiaSystem/VideoServer/QiaoJia/DB/DBStruct.h | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/QiaoJiaSystem/VideoServer/QiaoJia/DB/DBStruct.h b/QiaoJiaSystem/VideoServer/QiaoJia/DB/DBStruct.h
index 64e0d36..684890d 100644
--- a/QiaoJiaSystem/VideoServer/QiaoJia/DB/DBStruct.h
+++ b/QiaoJiaSystem/VideoServer/QiaoJia/DB/DBStruct.h
@@ -44,7 +44,7 @@
QDateTime tim_start_time;//寮�濮嬩笅杞界殑鏂囦欢鐨勬椂闂�
int n_duration;//姣忔涓嬭浇鐨勬椂闂撮暱搴︼紝鍗曚綅锛氬皬鏃�
QString str_brand;//鍝佺墝
- QString str_reserved;//棰勭暀
+ QString str_reserved;//鎴浘鍦板潃
};
struct Record_Cam_Dev
--
Gitblit v1.8.0