b6de9d5e64b6d6ee516f204d3a87d7b6e31c9a9b
# Conflicts: # sf_warehouse/__manifest__.py # sf_warehouse/static/src/kanban_color_change.scss # sf_warehouse/views/view.xml
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/销售订单行新增模型展示
#jikimo_sf
Description