Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具产品模板优化

# Conflicts: # sf_mrs_connect/models/res_config_setting.py
2023-06-29 11:15:40 +08:00
parent b02cb16dc9 78c13acbab
commit 37b834b3cf
15 changed files with 273 additions and 852 deletions
--- a/sf_tool_management/manifest.py
+++ b/sf_tool_management/manifest.py
@@ -27,6 +27,9 @@

        'web.assets_qweb': [
        ],
+        'web.assets_backend':[
+            'sf_tool_management/static/src/change.scss'
+        ]


    },