jinling.yang 41641f69fe Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀柄和夹头反注册到Cloud生成动态刀具物料 ...

# Conflicts:
#	sf_manufacturing/models/product_template.py

2023-09-08 14:08:08 +08:00

..

data

修复产品模板中产品类别为刀具和夹具时，根据产品类别为刀具和夹具时，新增的page页面里的字段显示及回显Bug

2023-07-17 16:46:01 +08:00

models

Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/新增上传模型功能

2023-08-24 17:32:25 +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/刀柄和夹头反注册到Cloud生成动态刀具物料

2023-09-08 14:08:08 +08:00

__init__.py

解决冲突

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

__manifest__.py

修复产品模板中产品类别为刀具和夹具时，根据产品类别为刀具和夹具时，新增的page页面里的字段显示及回显Bug

2023-07-17 16:46:01 +08:00