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

Browse Source

# Conflicts:
#	sf_tool_management/__init__.py
#	sf_tool_management/__manifest__.py
#	sf_tool_management/models/__init__.py
#	sf_tool_management/models/base.py
#	sf_tool_management/security/ir.model.access.csv
#	sf_tool_management/views/menu_view.xml
#	sf_tool_management/views/tool_base_views.xml

...

This commit is contained in:

qihao.gong@jikimo.com

2023-06-16 10:01:23 +08:00

parent b8dc06a7c7 376731fbd9

commit e9ad452c43

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available