Merge remote-tracking branch 'origin/yw.1.2.fixbug' into yw.1.2

pansen

2019-02-28 bcf8d8c62fdf61c4c3091bbf0db32383cbd5ea9e

 QiaoJiaSystem/DataManagerServer/AppPipeController.cpp

@@ -15,7 +15,7 @@
    }
    videoCaptureElement.registerConnector([&]{
        //if(!videoPublishElement.isBusy()){
            //videoPublishElement.setImage(videoCaptureElement.getImage());
            videoPublishElement.setImage(videoCaptureElement.getImage());
            //videoPublishElement.submit();
        //}