修改表格嵌套和转换列表误命中问题
Merge remote-tracking branch 'origin/dev-1.3.6' into dev-1.3.6