合并冲突

shuishen

2021-06-03 cd411e7b3ade23951e8935924252f7059cc096d5

1
2
3
4
5
<div class="dijitInline dijitColorPalette" role="grid">
    <table data-dojo-attach-point="paletteTableNode" class="dijitPaletteTable" cellSpacing="0" cellPadding="0" role="presentation">
        <tbody data-dojo-attach-point="gridNode"></tbody>
    </table>
</div>