解决冲突

2023-06-12 14:35:14 +08:00
parent e0983d0530
commit 3d04200ca7
167 changed files with 3468 additions and 7898 deletions
--- a/sf_base/views/menu_view.xml
+++ b/sf_base/views/menu_view.xml
@@ -120,6 +120,12 @@
                name="机床型号"
                sequence="1"
                action="action_sf_machine_tool_type"/>
+        <menuitem
+                id="menu_sf_machine_tool_category"
+                parent="menu_sf_base"
+                name="机床类型"
+                sequence="1"
+                action="action_sf_machine_tool_category"/>

        <menuitem
                id="menu_sf_cutting_tool"