Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具物料与夹具物料的反注册

This commit is contained in:
jinling.yang
2023-08-15 17:31:49 +08:00
110 changed files with 27374 additions and 1649 deletions

View File

@@ -8,7 +8,7 @@
<field name="arch" type="xml">
<tree string="刀具物料">
<field name="code"/>
<field name="name"/>
<field name="name" string="名称"/>
<field name="remark"/>
</tree>
</field>
@@ -24,7 +24,7 @@
<group string='基本信息'>
<group>
<field name="code"/>
<field name="name"/>
<field name="name" string="名称"/>
</group>
<group>
<field name="remark"/>