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

..

product_template_view.xml

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

product_workorder.xml

优化工单界面，新增物料page，修复工单按钮bug，隐藏权限字段

2023-02-02 14:59:39 +08:00