jinling.yang 37b834b3cf 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

..

data

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

2023-06-29 11:15:40 +08:00

models

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

2023-06-29 11:15:40 +08:00

static/util

产品创建时上传3D模型

2023-03-10 10:53:05 +08:00

views

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

2023-06-29 11:15:40 +08:00

__init__.py

解决冲突

2023-06-12 14:35:14 +08:00

__manifest__.py

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

2023-06-29 11:15:40 +08:00