合并代码解决冲突

miyanhui

2019-02-18 b5413f1f00fcf13104b07807e2046372764ef8dc

 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;