Merge branch 'dev_lsy' into dev_offline

AlgorithmModule/include/ImgCheckBase.h

@@ -2,7 +2,7 @@
 #define ImgCheckBase_H_
 #include <string>
 #include <memory>
-#define ALL_INTERFACE_VERSION 6
+#define ALL_INTERFACE_VERSION 7
 #define MAX_GPU_NUM 4
 
 enum CHECK_THREAD_RUN_STATUS

AlgorithmModule/src/CameraCheckAnalysisy.cpp

@@ -724,10 +724,10 @@ int CameraCheckAnalysisy::preDet_BQ(const cv::Mat &L255CutImg, std::shared_ptr<I
 		for (int i = 0; i < m_pCheck_Result->cameraBaseResult->pBQ_Result->pBQ_roiList.size(); i++)
 		{
 			cv::Rect boundingRect = m_pCheck_Result->cameraBaseResult->pBQ_Result->pBQ_roiList.at(i);
-			boundingRect.x -= 2;
+			boundingRect.x -= 5;
-			boundingRect.y -= 2;
+			boundingRect.y -= 5;
-			boundingRect.width += 4;
+			boundingRect.width += 10;
-			boundingRect.height += 4;
+			boundingRect.height += 10;
 			detImg_mask(boundingRect).setTo(255);
 		}
 		if (L255->result->in_shareImage->bDebugsaveImg)

AlgorithmModule/src/ImgCheckAnalysisy.cpp

@@ -170,7 +170,7 @@ int ImgCheckAnalysisy::GetStatus()
 
 std::string ImgCheckAnalysisy::GetVersion()
 {
-	return std::string("BOE_1.2.1_" + std::string(__DATE__) + "_" + std::string(__TIME__));
+	return std::string("BOE_1.2.3_" + std::string(__DATE__) + "_" + std::string(__TIME__));
 }
 
 std::string ImgCheckAnalysisy::GetErrorInfo()