db5d9863b1a3c49601691fad44306aba4699a28b
# Conflicts: # jikimo_frontend/static/src/scss/custom_style.scss # sf_manufacturing/views/mrp_workcenter_views.xml
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀柄和夹头反注册到Cloud生成动态刀具物料
#jikimo_sf
Description