Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/页面布局

2023-08-21 11:50:36 +08:00
parent f6841e5e9f 2cb84c5f55
commit 3ab0fcb337
3 changed files with 8 additions and 3 deletions
--- a/sf_base/views/base_view.xml
+++ b/sf_base/views/base_view.xml
@@ -92,6 +92,7 @@
            <tree string="机床型号" create="0" delete="1" edit="0">
                <field name="code"/>
                <field name="name" string="名称"/>
+                <field name="machine_tool_category"/>
                <field name="brand_id"/>
                <field name="remark"/>
                <field name="machine_tool_picture" widget="image"/>