da7184d841dd87148761dc1ab4b0ca947a207eca
# Conflicts: # sf_manufacturing/static/src/xml/kanban_change.xml
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/销售订单行新增模型展示
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/odoo16翻译研究
#jikimo_sf
Description