Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/夹具型号和功能夹具反向注册到cloud

This commit is contained in:
jinling.yang
2023-08-03 15:58:18 +08:00
9 changed files with 20145 additions and 433 deletions

View File

@@ -22,13 +22,13 @@
sequence="3"
/>
<menuitem
id="menu_sf_machine_tool"
parent="menu_sf_machine_tool_first"
name="机床"
sequence="0"
action="action_sf_machine_tool"
/>
<!-- <menuitem -->
<!-- id="menu_sf_machine_tool" -->
<!-- parent="menu_sf_machine_tool_first" -->
<!-- name="机床" -->
<!-- sequence="0" -->
<!-- action="action_sf_machine_tool" -->
<!-- /> -->
<menuitem
id="menu_sf_machine_tool_category"