Changes

Summary

  1. fix:修复合并的bug (details)
Commit 45d520e2e011f0cbcf1e89182a775f533c98b7e6 by wuyanjun110
fix:修复合并的bug
The file was modifieddata/constrain/block_data.cpp