fix: 事件冲突处理

郭全凯 requested to merge fix/gqk_bug_1_15 into test Jan 16, 2025