e9ad452c43d7fd3f0866369c5b715e60525b9c4c
# 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
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/销售订单行新增模型展示
#jikimo_sf
Description
Languages
Python
53%
JavaScript
30%
SCSS
8.1%
HTML
5.1%
CSS
1.9%
Other
1.9%