8356e898aa593ccea73fad337c5fe9b7147238ce
# Conflicts: # sf_manufacturing/views/mrp_workorder_view.xml
Merge branch 'master' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into release/release1.0
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化工单(cnc和cmc)涉及多个加工面
#jikimo_sf
Description