完成单根焊条完全焊完的测试
Merge remote-tracking branch 'origin/master'

Conflicts:
	C++/Locate/Test/findContourEdge.cpp