0254387c034407ecbdb2f8d3306dd0d134776caf
# Conflicts: # sf_sale/models/sale_order.py
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修复采购按钮显示及产品字段问题
#jikimo_sf
Description