Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具管理

This commit is contained in:
yuxianghui
2023-07-20 15:40:34 +08:00
10 changed files with 75 additions and 59 deletions

View File

@@ -11,7 +11,7 @@
<field name="name"/>
<field name="mrs_cutting_tool_type_id"/>
<field name="mrs_machine_brand_id"/>
<field name="mrs_cutting_tool_model_id"/>
<!-- <field name="mrs_cutting_tool_model_id"/> -->
<field name="mrs_materials_model_id"/>
<field name="mrs_cutting_tool_material_id"/>