Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/自建模块日志警告信息处理

# Conflicts:
#	sf_base/models/fixture.py
#	sf_manufacturing/models/model_type.py
#	sf_manufacturing/models/product_template.py
#	sf_sale/models/quick_easy_order.py

web_widget_model_viewer/__manifest__.py

@@ -19,5 +19,6 @@
         'web.assets_backend': [
             'web_widget_model_viewer/static/src/js/*',
         ],
-    }
+    },
+    'license': 'LGPL-3',
 }