Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/新增夹具功能

Browse Source

# 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

...

This commit is contained in:

jinling.yang

2023-06-27 16:40:58 +08:00

parent d18b1808d9 8b94696dc3

commit aea68f5239

11 changed files with 3340 additions and 355 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

2550

sf_mrs_connect/models/sync_common.py

File diff suppressed because it is too large Load Diff