Merge branch 'yw.1.2.fixbug' of ssh://192.168.1.226:29418/development/c++ i...

pansen

2019-03-15 c64a4f19a0a41b62917eb1dc8b0789c9ddf6baab

 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;