Resolve merge conflicts

C3204

2026-03-30 302de2f2816565e08371cd5345c3db402d88f54b

1
2026-02-09 15:15:34,225 [6] ERROR LB_SmartVisionCommon.AsyncLogHelper - 记录信息：流程[流程1]运行失败,原因是[Halcon2D_斑点工具]运行超时[脚本]num: 2368