Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/新增夹具功能

This commit is contained in:
jinling.yang
2023-06-29 17:14:48 +08:00
141 changed files with 20125 additions and 4856 deletions

View File

@@ -14,19 +14,13 @@
'data': [
'security/group_security.xml',
'security/ir.model.access.csv',
# 'data/fixture_data.xml'
'views/base_view.xml',
'views/common_view.xml',
'views/fixture_view.xml',
'views/functional_fixture_view.xml',
'views/menu_view.xml',
# "views/tool_base_views.xml",
# "views/tool_base_menu.xml",
# 'views/fixture_base_view.xml',
"views/tool_views.xml",
"views/tool_menu.xml",
# "views/tool_base_views.xml",
# "views/tool_base_menu.xml",
'views/menu_fixture_view.xml',
],