jinling.yang 97fcf6d91f Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具物料与夹具物料的反注册 ...

# Conflicts:
#	sf_base/views/base_view.xml

2023-08-17 18:03:12 +08:00

..

data

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

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

models

刀具产品模板根据型号展示不同字段和值

2023-06-29 18:53:11 +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-08-17 18:03:12 +08:00

__init__.py

解决冲突

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

__manifest__.py

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

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