jikimo/test
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/新增夹具功能

Browse Source 
# Conflicts:
#	sf_base/__manifest__.py
#	sf_base/models/__init__.py
#	sf_mrs_connect/data/ir_cron_data.xml
#	sf_mrs_connect/models/sync_common.py
This commit is contained in:
jinling.yang
2023-06-27 16:40:58 +08:00
parent d18b1808d9 8b94696dc3
commit aea68f5239
11 changed files with 3340 additions and 355 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sf_base/__manifest__.py
View File

@@ -23,6 +23,10 @@
# "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',
],