Changes

Summary

  1. fix:修复合并的bug (details)
  2. fix:修复合并的bug (details)
Commit 6c32fe6149effdf03a337fd1709353a36456cce6 by wuyanjun110
fix:修复合并的bug

The file was modifieddata/plan/switch_data.cpp
Commit 069ea6786697010789b21ee0541a48cd1b5b3bb9 by wuyanjun110
fix:修复合并的bug

The file was modifieddata/plan/switch_data.cpp