Merge remote-tracking branch 'origin/12.0' into 12.0

This commit is contained in:
ivan deng
2019-04-03 12:54:09 +08:00

View File

@@ -11,7 +11,6 @@
<attribute name="widget">ztree_select</attribute> <attribute name="widget">ztree_select</attribute>
<attribute name="ztree_parent_key">parent_id</attribute> <attribute name="ztree_parent_key">parent_id</attribute>
<attribute name="ztree_expend_level">2</attribute> <attribute name="ztree_expend_level">2</attribute>
<attribute name="limit">16</attribute>
<attribute name="order">name</attribute> <attribute name="order">name</attribute>
</xpath> </xpath>
</field> </field>