Merge remote-tracking branch 'origin/1.3nsq' into 1.3nsq

chenshijun

2019-04-15 ad8ee0872802ba5d0194458bf215a6cc89f4d0d0

 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;