aea68f5239970957d8eab6368f305ddd2c5ead26
# Conflicts: # sf_base/__manifest__.py # sf_base/models/__init__.py # sf_mrs_connect/data/ir_cron_data.xml # sf_mrs_connect/models/sync_common.py
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/销售订单行新增模型展示
#jikimo_sf
Description