578d9c46d98b74c25bcc7d1afa23216114a436d0
# Conflicts: # sf_manufacturing/static/src/js/kanban_change.js # sf_manufacturing/static/src/scss/kanban_change.scss # sf_manufacturing/views/mrp_workcenter_views.xml
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/销售订单行新增模型展示
#jikimo_sf
Description