合并代码解决冲突

miyanhui

2019-02-18 b5413f1f00fcf13104b07807e2046372764ef8dc

 QiaoJiaSystem/DataManagerServer/AppPipeController.cpp

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