jikimo/jikimo_sf
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

处理冲突

Browse Source
This commit is contained in:
qihao.gong@jikimo.com
2023-06-16 10:02:33 +08:00
parent e9ad452c43
commit 018fecfc59
25 changed files with 2855 additions and 905 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
sf_base/views/menu_view.xml
View File

@@ -127,26 +127,6 @@
sequence="1"
action="action_sf_machine_tool_category"/>
<menuitem
id="menu_sf_cutting_tool"
parent="mrp.menu_mrp_configuration"
name="刀具"
sequence="5"/>
<menuitem
id="menu_sf_cutting_tool_category"
parent="menu_sf_cutting_tool"
name="刀具类别"
sequence="1"
action="action_sf_cutting_tool_category"/>
<menuitem
id="menu_sf_cutting_tool_type"
parent="menu_sf_cutting_tool"
name="刀具型号"
sequence="1"
action="action_sf_cutting_tool_type"/>
<menuitem
id="menu_sf_machine_control_system"
parent="menu_sf_base"