Commit 0ebeb569 by 高晓磊

添加排序字段&&合并冲突解决

parent 019ab884
...@@ -115,6 +115,15 @@ ...@@ -115,6 +115,15 @@
<m:description></m:description> <m:description></m:description>
<m:default></m:default> <m:default></m:default>
</m:attribute> </m:attribute>
<m:attribute>
<m:annotations></m:annotations>
<m:id>bd60d3ff-9308-4f15-aa1e-67d2923192f2</m:id>
<m:name>sort_order</m:name>
<m:title>排序</m:title>
<m:type>int</m:type>
<m:description></m:description>
<m:default></m:default>
</m:attribute>
</m:attributes> </m:attributes>
</m:class> </m:class>
</content> </content>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment