From e2ec42921840535c445e40b76661d0ffd9baef8f Mon Sep 17 00:00:00 2001
From: pansen <pansen626@sina.com>
Date: 星期五, 15 三月 2019 11:27:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/yw.1.2.fixbug' 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