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

Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/sf刀具功能分支

Browse Source 
# Conflicts:
#	sf_tool_management/views/tool_base_views.xml
This commit is contained in:
yuxianghui
2023-06-28 09:15:55 +08:00
parent d6f749fff5 8b94696dc3
commit c94c661506
18 changed files with 3206 additions and 1881 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sf_tool_management/views/menu_view.xml
View File

@@ -21,7 +21,7 @@
parent="menu_sf_tool_manage"
name="功能刀具列表"
sequence="3"
action="sf_base.action_sf_functional_cutting_tool"
action="sf_function_tool_entry_list_view_act"
/>
@@ -29,8 +29,8 @@
id="menu_sf_functional_cutting_tool_warning"
parent="menu_sf_tool_manage"
name="功能刀具预警"
sequence="3"
action="action_sf_functional_cutting_tool_warning"
sequence="4"
action="sf_function_tool_entry_warning_view_act"
/>
<menuitem