From 33fe4b9b675afc631eb9ed12fe5db1e01972facf Mon Sep 17 00:00:00 2001
From: pansen <pansen626@sina.com>
Date: 星期四, 14 三月 2019 14:55:52 +0800
Subject: [PATCH] Merge branch 'yw.1.2.fixbug' of ssh://192.168.1.226:29418/development/c++ into yw.1.2

---
 QiaoJiaSystem/StructureApp/TrackingTrigger.h |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/QiaoJiaSystem/StructureApp/TrackingTrigger.h b/QiaoJiaSystem/StructureApp/TrackingTrigger.h
index 3f1019c..05ccc42 100644
--- a/QiaoJiaSystem/StructureApp/TrackingTrigger.h
+++ b/QiaoJiaSystem/StructureApp/TrackingTrigger.h
@@ -30,6 +30,7 @@
                 found = true;
                 rect.id = lastRect.id;
                 lastRect.properties["time"]=rect.properties["time"];
+                lastRect.properties["imgKey"]=rect.properties["imgKey"];
                 rect.properties = lastRect.properties;
                 tempScoreRects.push_back(rect);
                 break;

--
Gitblit v1.8.0